aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>2019-03-30 13:49:05 +0800
committerPhil Christensen <philc@microsoft.com>2019-03-29 22:49:05 -0700
commit89fd63fb4b24bf9dcbef789526011dc98ec5d457 (patch)
treef355ea9019458c536957d2f6e28853ee5b3979da
parent9e8db15b9689730b06d1f9b15eec01593dccb7c5 (diff)
downloadvcpkg-89fd63fb4b24bf9dcbef789526011dc98ec5d457.tar.gz
vcpkg-89fd63fb4b24bf9dcbef789526011dc98ec5d457.zip
[jsonnet] Fix white-space-path issue. (#5862)
-rw-r--r--ports/jsonnet/CONTROL2
-rw-r--r--ports/jsonnet/portfile.cmake8
2 files changed, 5 insertions, 5 deletions
diff --git a/ports/jsonnet/CONTROL b/ports/jsonnet/CONTROL
index 99901570d..49618f59e 100644
--- a/ports/jsonnet/CONTROL
+++ b/ports/jsonnet/CONTROL
@@ -1,3 +1,3 @@
Source: jsonnet
-Version: 2018-11-01-1
+Version: 2018-11-01-2
Description: Jsonnet - The data templating language
diff --git a/ports/jsonnet/portfile.cmake b/ports/jsonnet/portfile.cmake
index f2d0bbb8f..ee3c43890 100644
--- a/ports/jsonnet/portfile.cmake
+++ b/ports/jsonnet/portfile.cmake
@@ -10,14 +10,14 @@ vcpkg_from_github(
if (WIN32)
vcpkg_execute_required_process(
- COMMAND Powershell -Command "((Get-Content -Encoding Byte ${SOURCE_PATH}/stdlib/std.jsonnet) -join ',') + ',0' > ${SOURCE_PATH}/core/std.jsonnet.h"
- WORKING_DIRECTORY ${SOURCE_PATH}
+ COMMAND Powershell -Command "((Get-Content -Encoding Byte \"${SOURCE_PATH}/stdlib/std.jsonnet\") -join ',') + ',0' > \"${SOURCE_PATH}/core/std.jsonnet.h\""
+ WORKING_DIRECTORY "${SOURCE_PATH}"
LOGNAME "std.jsonnet"
)
else()
vcpkg_execute_required_process(
- COMMAND bash -c "((od -v -Anone -t u1 ${SOURCE_PATH}/stdlib/std.jsonnet | tr ' ' '\\n' | grep -v '^$' | tr '\\n' ',' ) && echo '0') > ${SOURCE_PATH}/core/std.jsonnet.h"
- WORKING_DIRECTORY ${SOURCE_PATH}
+ COMMAND bash -c "((od -v -Anone -t u1 \"${SOURCE_PATH}/stdlib/std.jsonnet\" | tr ' ' '\\n' | grep -v '^$' | tr '\\n' ',' ) && echo '0') > \"${SOURCE_PATH}/core/std.jsonnet.h\""
+ WORKING_DIRECTORY "${SOURCE_PATH}"
LOGNAME "std.jsonnet"
)
endif()