commit 553006c7e59542c9ae2ebc96f756ae1d22752881 parent f854232837cb04960f1d116742c44de7f4e78ef7 Author: ThomasV <thomasv@electrum.org> Date: Tue, 27 Mar 2018 16:51:39 +0200 follow-up previous commit Diffstat:
| M | contrib/build-osx/base.sh | | | 3 | --- |
| M | contrib/build-osx/make_osx | | | 4 | +++- |
| M | contrib/build-osx/package.sh | | | 2 | ++ |
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/contrib/build-osx/base.sh b/contrib/build-osx/base.sh @@ -10,6 +10,3 @@ function fail { printf "\r🗯 ${RED}ERROR:${NC} ${1}\n" exit 1 } - -build_dir=$(dirname "$1") -test -n "$build_dir" -a -d "$build_dir" || exit diff --git a/contrib/build-osx/make_osx b/contrib/build-osx/make_osx @@ -7,7 +7,9 @@ PACKAGE=Electrum GIT_REPO=https://github.com/spesmilo/electrum . $(dirname "$0")/base.sh -cd $build_dir/../.. + +src_dir=$(dirname "$0") +cd $src_dir/../.. export PYTHONHASHSEED=22 VERSION=`git describe --tags` diff --git a/contrib/build-osx/package.sh b/contrib/build-osx/package.sh @@ -59,6 +59,8 @@ rm -rf /tmp/electrum-macos/image > /dev/null 2>&1 mkdir /tmp/electrum-macos/image/ cp -r $1 /tmp/electrum-macos/image/ +build_dir=$(dirname "$1") +test -n "$build_dir" -a -d "$build_dir" || exit cd $build_dir ${genisoimage} \