diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/build-distribution-archives | 4 | ||||
| -rwxr-xr-x | bin/build-electron | 23 |
2 files changed, 12 insertions, 15 deletions
diff --git a/bin/build-distribution-archives b/bin/build-distribution-archives index ff2f3e79..9eb03b0c 100755 --- a/bin/build-distribution-archives +++ b/bin/build-distribution-archives @@ -8,9 +8,9 @@ cp -a images/examples palettes symbols fonts dist/inkstitch cp -a icons locales print dist/inkstitch/bin if [ "$BUILD" = "osx" ]; then - cp -a electron/dist/mac dist/inkstitch/electron + cp -a electron/build/mac dist/inkstitch/electron else - cp -a electron/dist/*-unpacked dist/inkstitch/electron + cp -a electron/build/*-unpacked dist/inkstitch/electron fi mkdir artifacts diff --git a/bin/build-electron b/bin/build-electron index 1b90b556..dc7a1ca2 100755 --- a/bin/build-electron +++ b/bin/build-electron @@ -1,19 +1,16 @@ #!/bin/bash + + if [ "$BUILD" = "windows" ]; then - cd electron - yarn --link-duplicates --pure-lockfile && yarn run dist -w --ia32 + args="-w --ia32" elif [ "$BUILD" = "linux" ]; then args="-l --x64" - - docker run --rm \ - -e ELECTRON_CACHE=$HOME/.cache/electron \ - -v ${PWD}/electron:/project \ - -v ~/.cache/electron:/root/.cache/electron \ - electronuserland/builder:wine \ - /bin/bash -c "yarn --link-duplicates --pure-lockfile && yarn run dist ${args}" -else - cd electron - npm install - npm run dist +elif [ "$BUILD" = "osx" ]; then + args="-m" fi + +cd electron +npm install -g yarn +yarn --link-duplicates --pure-lockfile +yarn run dist ${args} |