This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/scripts/common-functions.sh b/scripts/common-functions.sh | |
| index 7be2527d9..1042cc490 100644 | |
| --- a/scripts/common-functions.sh | |
| +++ b/scripts/common-functions.sh | |
| @@ -3,10 +3,11 @@ | |
| base_common="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" | |
| function find_binary { | |
| - pushd "$base_common/.." > /dev/null || exit | |
| - binpath=$(stack path --local-install-root)/bin |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #!/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/bash | |
| set +e | |
| export PATH=/nix/store/79j0pfqnqigdbbn6g5d4ls4jbj8bp5p0-stylish-haskell-0.9.2.0/bin:$PATH | |
| export LOCALE_ARCHIVE="/nix/store/vg0s4sl74f5ik64wrrx0q9n6m48vvmgs-glibc-locales-2.26-131/lib/locale/locale-archive" | |
| export LC_ALL=en_GB.UTF-8 | |
| export LANG=en_GB.UTF-8 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| set +e | |
| export PATH=/nix/store/79j0pfqnqigdbbn6g5d4ls4jbj8bp5p0-stylish-haskell-0.9.2.0/bin:$PATH | |
| export LOCALE_ARCHIVE="/nix/store/vg0s4sl74f5ik64wrrx0q9n6m48vvmgs-glibc-locales-2.26-131/lib/locale/locale-archive" | |
| export LC_ALL=en_GB.UTF-8 | |
| export LANG=en_GB.UTF-8 | |
| cp -a /nix/store/pr6j8ygrbb3m1mbvzsrchr7ykn7r14a8-devops-942-hydra-fixes orig | |
| cp -a /nix/store/pr6j8ygrbb3m1mbvzsrchr7ykn7r14a8-devops-942-hydra-fixes stylish | |
| chmod -R +w stylish | |
| cd stylish |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git i/Externals/cubeb/CMakeLists.txt w/Externals/cubeb/CMakeLists.txt | |
| index 3604041d7..abb3504de 100644 | |
| --- i/Externals/cubeb/CMakeLists.txt | |
| +++ w/Externals/cubeb/CMakeLists.txt | |
| @@ -62,7 +62,7 @@ target_include_directories(cubeb | |
| PUBLIC $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/exports> | |
| ) | |
| -install(DIRECTORY ${CMAKE_SOURCE_DIR}/include DESTINATION ${CMAKE_INSTALL_PREFIX}) | |
| +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include DESTINATION ${CMAKE_INSTALL_PREFIX}) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git c/scripts/launch/demo.sh i/scripts/launch/demo.sh | |
| index a3f26a895..2d86f6008 100755 | |
| --- c/scripts/launch/demo.sh | |
| +++ i/scripts/launch/demo.sh | |
| @@ -180,6 +180,9 @@ while [[ $i -lt $panesCnt ]]; do | |
| # shellcheck disable=SC2154 | |
| full_node_args="$node_args $reb $no_ntp $keys_args $rts_opts" | |
| + if [[ $WALLET_CLIENT_AUTH_DISABLE != "" ]]; then | |
| + full_node_args="$full_node_args --no-client-auth" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git i/scripts/launch/demo.sh w/scripts/launch/demo.sh | |
| index a3f26a895..6d9367827 100755 | |
| --- i/scripts/launch/demo.sh | |
| +++ w/scripts/launch/demo.sh | |
| @@ -168,6 +168,9 @@ while [[ $i -lt $panesCnt ]]; do | |
| if [[ $WALLET_DEBUG != "" ]]; then | |
| wallet_args="$wallet_args --wallet-debug" | |
| fi | |
| + if [[ $WALLET_CLIENT_AUTH_DISABLE != "" ]]; then | |
| + wallet_args="$wallet_args --no-client-auth" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git i/scripts/launch/demo.sh w/scripts/launch/demo.sh | |
| index 99bac612f..145e812e7 100755 | |
| --- i/scripts/launch/demo.sh | |
| +++ w/scripts/launch/demo.sh | |
| @@ -179,7 +179,7 @@ while [[ $i -lt $panesCnt ]]; do | |
| ensure_run $run_dir | |
| # shellcheck disable=SC2154 | |
| - full_node_args="$node_args $reb $no_ntp $keys_args $rts_opts" | |
| + full_node_args="$node_args $reb $no_ntp $keys_args $rts_opts --no-client-auth" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| NAME USED USEDSNAP | |
| zpool 182G 0B | |
| zpool/docker 196M 0B | |
| zpool/docker/074a86af60cf205549110f2548b7c32790ae3d162a9c4de54f28df4312c53794 97.2M 0B | |
| zpool/docker/be8321c5da604619a54251d472c3070c0a1e845d83a519711c7bfb92f2219229 97.3M 0B | |
| zpool/root 181G 0B | |
| zpool/root/home 127G 20.0G | |
| zpool/root/nix 51.0G 0B | |
| zpool/root/nixos 2.67G 632M | |
| zpool/root/nixos/45dfef0b88cc7795bcb913b57c4690f3a9b1c476081ddd67a4f9cfcabd90d585 248M 0B |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| NAME USED REFER WRITTEN | |
| zpool/root/home@zfs-auto-snap_hourly-2018-03-29-16h00 44.6M 98.4G 98.4G | |
| zpool/root/home@zfs-auto-snap_hourly-2018-03-29-17h00 36.4M 98.4G 53.6M | |
| zpool/root/home@zfs-auto-snap_hourly-2018-03-29-18h00 27.0M 98.4G 52.5M | |
| zpool/root/home@zfs-auto-snap_hourly-2018-03-29-19h00 39.4M 98.4G 42.9M | |
| zpool/root/home@zfs-auto-snap_hourly-2018-03-29-20h00 17.3M 98.4G 44.2M | |
| zpool/root/home@zfs-auto-snap_hourly-2018-03-29-21h00 11.0M 98.4G 21.7M | |
| zpool/root/home@zfs-auto-snap_hourly-2018-03-29-22h00 40.8M 98.4G 44.1M | |
| zpool/root/home@zfs-auto-snap_hourly-2018-03-29-23h00 31.8M 98.4G 36.9M | |
| zpool/root/home@zfs-auto-snap_daily-2018-03-30-00h00 0B 98.4G 24.9M |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git i/src/ShellCheck/Analytics.hs w/src/ShellCheck/Analytics.hs | |
| index b094acf..18adff4 100644 | |
| --- i/src/ShellCheck/Analytics.hs | |
| +++ w/src/ShellCheck/Analytics.hs | |
| @@ -417,9 +417,10 @@ indexOfSublists sub = f 0 | |
| prop_checkShebangParameters1 = verifyTree checkShebangParameters "#!/usr/bin/env bash -x\necho cow" | |
| prop_checkShebangParameters2 = verifyNotTree checkShebangParameters "#! /bin/sh -l " | |
| +prop_checkShebangParameters3 = verifyTree checkShebangParameters "#!/usr/bin/env nix-shell\n#!nix-shell -i bash -p coreutils jq\necho cow" | |
| checkShebangParameters p (T_Annotation _ _ t) = checkShebangParameters p t |