From b62fffe626fc8ed92fbae4d79a8e190cc8ab209a Mon Sep 17 00:00:00 2001 From: jobevers Date: Thu, 26 Jan 2017 19:03:14 -0600 Subject: [PATCH] replace electron-packager with electron-builder --- build.sh | 15 ++------------- prebuild.sh | 8 -------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/build.sh b/build.sh index 527fb6da9..f699010cf 100755 --- a/build.sh +++ b/build.sh @@ -61,23 +61,10 @@ mv "$ROOT/lbrynet/dist/lbry" "$ROOT/app/dist" if [ -n "${TEAMCITY_VERSION:-}" ]; then - electron-packager --electron-version=1.4.14 --overwrite "$ROOT/app" LBRY --icon="${ICON}" ( - pushd "$ROOT/lbry" - VERSION=$(python setup.py -V) - popd if [ "$(uname)" == "Darwin" ]; then - PLATFORM="darwin" - rm -rf "$ROOT/package/osx/LBRY.app" - mv "LBRY-${PLATFORM}-x64/LBRY.app" "$ROOT/package/osx/LBRY.app" - cd "$ROOT/package/osx/" security unlock-keychain -p ${KEYCHAIN_PASSWORD} osx-build.keychain - codesign --deep -s "${LBRY_DEVELOPER_ID}" -f LBRY.app - # check if the signing actually worked - codesign -vvv LBRY.app/ - dmgbuild -s dmg_settings.py "LBRY" "lbry-${VERSION}.dmg" - mv "lbry-${VERSION}.dmg" "${ROOT}" elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then OS="linux" PLATFORM="linux" @@ -87,6 +74,8 @@ if [ -n "${TEAMCITY_VERSION:-}" ]; then fi ) + node_modules/.bin/build + echo 'Build and packaging complete.' else echo 'Build complete. Run `electron electron` to launch the app' diff --git a/prebuild.sh b/prebuild.sh index 16b3ef107..c2bc94fbd 100755 --- a/prebuild.sh +++ b/prebuild.sh @@ -92,11 +92,3 @@ if ! cmd_exists node; then brew install node fi fi - -if ! cmd_exists electron-packager; then - $SUDO npm install --global electron-packager -fi - -if $OSX && ! cmd_exists dmgbuild; then - $SUDO pip install dmgbuild -fi