jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-27 21:26:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: move GNU/Linux zip generation to installer-appimage (#913)

Browse Source 
Currently, `installer-appimage` creates only the AppImage, and we rely
on code outside the main task to package it up as a Zip. Since Zip is
a required step for AppImage deployment (since the AppImage will lose
its execution permissions if its moved around), we integrate Zip
generation into the AppImage task itself.

Signed-off-by: Juan Cruz Viotti <jviotti@openmailbox.org>
This commit is contained in:
Juan Cruz Viotti 2016-12-01 12:29:27 -04:00 committed by GitHub
parent 6f0fe93aad
commit 4f233f20e0
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/build/linux.sh
View File

@ -168,13 +168,7 @@ if [ "$COMMAND" == "installer-appimage" ]; then
-r $ARCH \ -r $ARCH \
-b etcher \ -b etcher \
-i assets/icon.png \ -i assets/icon.png \
-o etcher-release/$APPLICATION_NAME-linux-$ARCH.AppImage -o etcher-release/installers/$APPLICATION_NAME-$APPLICATION_VERSION-linux-$ARCH.zip
pushd etcher-release
zip $APPLICATION_NAME-$APPLICATION_VERSION-linux-$ARCH.zip $APPLICATION_NAME-linux-$ARCH.AppImage
mkdir -p installers
mv $APPLICATION_NAME-$APPLICATION_VERSION-linux-$ARCH.zip installers
popd
exit 0 exit 0
fi fi

14
scripts/linux/electron-installer-appimage.sh
View File

@ -18,6 +18,7 @@
set -u set -u
set -e set -e
set -x
function check_dep() { function check_dep() {
if ! command -v $1 2>/dev/null 1>&2; then if ! command -v $1 2>/dev/null 1>&2; then
@ -101,11 +102,11 @@ else
exit 1 exit 1
fi fi
OUTPUT_FILENAME="$ARGV_APPLICATION_NAME-linux-$ARGV_ARCHITECTURE.AppImage"
# Create AppDir # Create AppDir
OUTPUT_FILENAME="$(basename "$ARGV_OUTPUT")"
APPDIR_PATH=/tmp/${OUTPUT_FILENAME%.*}.AppDir APPDIR_PATH=/tmp/${OUTPUT_FILENAME%.*}.AppDir
APPDIR_ICON_FILENAME=icon APPDIR_ICON_FILENAME=icon
mkdir -p "$(dirname "$ARGV_OUTPUT")"
rm -rf "$APPDIR_PATH" rm -rf "$APPDIR_PATH"
mkdir -p "$APPDIR_PATH/usr/bin" mkdir -p "$APPDIR_PATH/usr/bin"
download_executable \ download_executable \
@ -143,6 +144,7 @@ else
fi fi
# Generate AppImage # Generate AppImage
mkdir -p "$(dirname "$ARGV_OUTPUT")"
rm -f "$ARGV_OUTPUT" rm -f "$ARGV_OUTPUT"
APPIMAGEASSISTANT_PATH=/tmp/AppImageAssistant.AppImage APPIMAGEASSISTANT_PATH=/tmp/AppImageAssistant.AppImage
@ -150,5 +152,11 @@ download_executable \
"$APPIMAGES_GITHUB_RELEASE_BASE_URL/AppImageAssistant_$APPIMAGES_TAG-$APPIMAGES_ARCHITECTURE.AppImage" \ "$APPIMAGES_GITHUB_RELEASE_BASE_URL/AppImageAssistant_$APPIMAGES_TAG-$APPIMAGES_ARCHITECTURE.AppImage" \
$APPIMAGEASSISTANT_PATH $APPIMAGEASSISTANT_PATH
$APPIMAGEASSISTANT_PATH "$APPDIR_PATH" "$ARGV_OUTPUT" $APPIMAGEASSISTANT_PATH "$APPDIR_PATH" "$(dirname "$ARGV_OUTPUT")/$OUTPUT_FILENAME"
rm -rf "$APPDIR_PATH" rm -rf "$APPDIR_PATH"
# Package AppImage inside a Zip to preserve the execution permissions
pushd "$(dirname "$ARGV_OUTPUT")"
zip "$(basename "$ARGV_OUTPUT")" "$OUTPUT_FILENAME"
rm -f "$OUTPUT_FILENAME"
popd