AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #10236 from SomberNight/202509_bash_subshell_set_e

Browse Source 
contrib: "set -e" behaves weird in subshells followed by OR. don't use.
This commit is contained in:
ghost43
2025-09-25 14:49:53 +00:00
committed by GitHub
parent de7612b3b1 ffba6061bc
commit 14d7c96419
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/build-linux/appimage/build.sh
View File

@@ -50,7 +50,7 @@ else
info "not doing fresh clone." info "not doing fresh clone."
fi fi
# build the type2-runtime binary, this build step uses a separate docker container # build the type2-runtime binary, this build step uses a separate docker container
# defined in the type2-runtime repo (patched with type2-runtime-reproducible-build.patch) # defined in the type2-runtime repo (patched with type2-runtime-reproducible-build.patch)
TYPE2_RUNTIME_REPO_DIR="$PROJECT_ROOT_OR_FRESHCLONE_ROOT/contrib/build-linux/appimage/.cache/appimage/type2-runtime" TYPE2_RUNTIME_REPO_DIR="$PROJECT_ROOT_OR_FRESHCLONE_ROOT/contrib/build-linux/appimage/.cache/appimage/type2-runtime"
( (
@@ -74,7 +74,7 @@ TYPE2_RUNTIME_REPO_DIR="$PROJECT_ROOT_OR_FRESHCLONE_ROOT/contrib/build-linux/app
rm -rf "$TYPE2_RUNTIME_REPO_DIR/out" rm -rf "$TYPE2_RUNTIME_REPO_DIR/out"
info "runtime build successful: $(sha256sum "$TYPE2_RUNTIME_REPO_DIR/runtime-x86_64")" info "runtime build successful: $(sha256sum "$TYPE2_RUNTIME_REPO_DIR/runtime-x86_64")"
) || fail "Failed to build type2-runtime" )
info "building binary..." info "building binary..."
# check uid and maybe chown. see #8261 # check uid and maybe chown. see #8261

2
contrib/build-linux/appimage/make_appimage.sh
View File

@@ -181,7 +181,7 @@ info "finalizing AppDir."
mv usr/include usr/include.tmp mv usr/include usr/include.tmp
delete_blacklisted delete_blacklisted
mv usr/include.tmp usr/include mv usr/include.tmp usr/include
) || fail "Could not finalize AppDir" )
info "Copying additional libraries" info "Copying additional libraries"
( (

2
contrib/build-wine/prepare-wine.sh
View File

@@ -95,7 +95,7 @@ info "Building PyInstaller."
popd popd
# sanity check bootloader is there: # sanity check bootloader is there:
[[ -e "PyInstaller/bootloader/Windows-$PYINST_ARCH-intel/runw.exe" ]] || fail "Could not find runw.exe in target dir!" [[ -e "PyInstaller/bootloader/Windows-$PYINST_ARCH-intel/runw.exe" ]] || fail "Could not find runw.exe in target dir!"
) || fail "PyInstaller build failed" )
info "Installing PyInstaller." info "Installing PyInstaller."
$WINE_PYTHON -m pip install --no-build-isolation --no-dependencies --no-warn-script-location ./pyinstaller $WINE_PYTHON -m pip install --no-build-isolation --no-dependencies --no-warn-script-location ./pyinstaller

4
contrib/osx/make_osx.sh
View File

@@ -117,7 +117,7 @@ PYINSTALLER_COMMIT="306d4d92580fea7be7ff2c89ba112cdc6f73fac1"
popd popd
# sanity check bootloader is there: # sanity check bootloader is there:
[[ -e "PyInstaller/bootloader/Darwin-64bit/runw" ]] || fail "Could not find runw in target dir!" [[ -e "PyInstaller/bootloader/Darwin-64bit/runw" ]] || fail "Could not find runw in target dir!"
) || fail "PyInstaller build failed" )
info "Installing PyInstaller." info "Installing PyInstaller."
python3 -m pip install --no-build-isolation --no-dependencies \ python3 -m pip install --no-build-isolation --no-dependencies \
--cache-dir "$PIP_CACHE_DIR" --no-warn-script-location "$CACHEDIR/pyinstaller" --cache-dir "$PIP_CACHE_DIR" --no-warn-script-location "$CACHEDIR/pyinstaller"
@@ -144,7 +144,7 @@ info "preparing electrum-locale."
"$CONTRIB/locale/build_cleanlocale.sh" "$CONTRIB/locale/build_cleanlocale.sh"
# we want the binary to have only compiled (.mo) locale files; not source (.po) files # we want the binary to have only compiled (.mo) locale files; not source (.po) files
rm -r "$PROJECT_ROOT/electrum/locale/locale"/*/electrum.po rm -r "$PROJECT_ROOT/electrum/locale/locale"/*/electrum.po
) || fail "failed generating locale" )
if ls "$DLL_TARGET_DIR"/libsecp256k1.*.dylib 1> /dev/null 2>&1; then if ls "$DLL_TARGET_DIR"/libsecp256k1.*.dylib 1> /dev/null 2>&1; then