diff --git a/package.json b/package.json index ed8f4e9e..a0d97304 100644 --- a/package.json +++ b/package.json @@ -58,6 +58,7 @@ } }, "optionalDependencies": { + "electron-installer-debian": "^0.5.1", "elevator": "^2.2.2" }, "dependencies": { @@ -95,7 +96,7 @@ "semver": "^5.1.0", "sudo-prompt": "^6.1.0", "trackjs": "^2.1.16", - "udif": "^0.7.0", + "udif": "^0.8.0", "unbzip2-stream": "^1.0.11", "yargs": "^4.6.0", "yauzl": "^2.6.0" diff --git a/scripts/build/docker/Dockerfile-i686 b/scripts/build/docker/Dockerfile-i686 index f775b773..27ecd9ac 100644 --- a/scripts/build/docker/Dockerfile-i686 +++ b/scripts/build/docker/Dockerfile-i686 @@ -25,7 +25,7 @@ RUN apt-get update && apt-get install -y \ RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \ && apt-get install -y nodejs RUN npm config set spin=false -RUN npm install -g asar electron-installer-debian +RUN npm install -g asar # Python RUN pip install codespell==1.9.2 awscli diff --git a/scripts/build/docker/Dockerfile-x86_64 b/scripts/build/docker/Dockerfile-x86_64 index 20d3b322..53ac8a85 100644 --- a/scripts/build/docker/Dockerfile-x86_64 +++ b/scripts/build/docker/Dockerfile-x86_64 @@ -25,7 +25,7 @@ RUN apt-get update && apt-get install -y \ RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \ && apt-get install -y nodejs RUN npm config set spin=false -RUN npm install -g asar electron-installer-debian +RUN npm install -g asar # Python RUN pip install codespell==1.9.2 awscli diff --git a/scripts/build/docker/Dockerfile.template b/scripts/build/docker/Dockerfile.template index c4aae1ad..af3a8a2e 100644 --- a/scripts/build/docker/Dockerfile.template +++ b/scripts/build/docker/Dockerfile.template @@ -25,7 +25,7 @@ RUN apt-get update && apt-get install -y \ RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \ && apt-get install -y nodejs RUN npm config set spin=false -RUN npm install -g asar electron-installer-debian +RUN npm install -g asar # Python RUN pip install codespell==1.9.2 awscli diff --git a/scripts/build/electron-installer-debian-linux.sh b/scripts/build/electron-installer-debian-linux.sh index b82e1015..24083ad2 100755 --- a/scripts/build/electron-installer-debian-linux.sh +++ b/scripts/build/electron-installer-debian-linux.sh @@ -25,7 +25,9 @@ if [[ "$OS" != "Linux" ]]; then exit 1 fi -./scripts/build/check-dependency.sh electron-installer-debian +ELECTRON_INSTALLER_DEBIAN="./node_modules/.bin/electron-installer-debian" + +./scripts/build/check-dependency.sh "$ELECTRON_INSTALLER_DEBIAN" function usage() { echo "Usage: $0" @@ -65,7 +67,7 @@ fi DEBIAN_ARCHITECTURE=$(./scripts/build/architecture-convert.sh -r "$ARGV_ARCHITECTURE" -t debian) cp scripts/build/debian/etcher-electron.sh "$ARGV_DIRECTORY" -electron-installer-debian \ +"$ELECTRON_INSTALLER_DEBIAN" \ --src "$ARGV_DIRECTORY" \ --dest "$ARGV_OUTPUT" \ --config "$ARGV_DEBIAN_CONFIGURATION" \