From 166afe2789a01bccf201812c7444de47cf80edd0 Mon Sep 17 00:00:00 2001 From: jobevers Date: Thu, 26 Jan 2017 20:36:05 -0600 Subject: [PATCH] linux build works on my machine --- build.sh | 17 ++++------------- build/icons/{lbry128.png => 128x128.png} | Bin build/icons/{lbry256.png => 256x256.png} | Bin build/icons/{lbry32.png => 32x32.png} | Bin build/icons/{lbry48.png => 48x48.png} | Bin build/icons/{lbry96.png => 96x96.png} | Bin 6 files changed, 4 insertions(+), 13 deletions(-) rename build/icons/{lbry128.png => 128x128.png} (100%) rename build/icons/{lbry256.png => 256x256.png} (100%) rename build/icons/{lbry32.png => 32x32.png} (100%) rename build/icons/{lbry48.png => 48x48.png} (100%) rename build/icons/{lbry96.png => 96x96.png} (100%) diff --git a/build.sh b/build.sh index af09b1a3f..beb2823d9 100755 --- a/build.sh +++ b/build.sh @@ -59,21 +59,12 @@ mv "$ROOT/lbrynet/dist/lbry" "$ROOT/app/dist" if [ -n "${TEAMCITY_VERSION:-}" ]; then - - ( - if [ "$(uname)" == "Darwin" ]; then - security unlock-keychain -p ${KEYCHAIN_PASSWORD} osx-build.keychain - elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then - OS="linux" - PLATFORM="linux" - tar cvzf "lbry-${OS}.tgz" "LBRY-${PLATFORM}-x64/" - else - OS="unknown" - fi - ) + if [ "$(uname)" == "Darwin" ]; then + security unlock-keychain -p ${KEYCHAIN_PASSWORD} osx-build.keychain + fi node_modules/.bin/build - + echo 'Build and packaging complete.' else echo 'Build complete. Run `electron electron` to launch the app' diff --git a/build/icons/lbry128.png b/build/icons/128x128.png similarity index 100% rename from build/icons/lbry128.png rename to build/icons/128x128.png diff --git a/build/icons/lbry256.png b/build/icons/256x256.png similarity index 100% rename from build/icons/lbry256.png rename to build/icons/256x256.png diff --git a/build/icons/lbry32.png b/build/icons/32x32.png similarity index 100% rename from build/icons/lbry32.png rename to build/icons/32x32.png diff --git a/build/icons/lbry48.png b/build/icons/48x48.png similarity index 100% rename from build/icons/lbry48.png rename to build/icons/48x48.png diff --git a/build/icons/lbry96.png b/build/icons/96x96.png similarity index 100% rename from build/icons/lbry96.png rename to build/icons/96x96.png