genappimage.sh: migrate to linuxdeploy #10027

generate_type2_appimage is unmaintained, and lacks a way to rename the appimage file.

fix #9893
This commit is contained in:
Douglas 'dopessoa' Pessoa 2019-05-18 15:38:19 -03:00 committed by Justin M. Keyes
parent e8beea204b
commit aa610690bf
1 changed files with 24 additions and 26 deletions

View File

@ -37,29 +37,24 @@ VERSION=$("$ROOT_DIR"/build/bin/nvim --version | head -n 1 | grep -o 'v.*')
cd "$APP_BUILD_DIR" cd "$APP_BUILD_DIR"
curl -Lo "$APP_BUILD_DIR"/appimage_functions.sh https://github.com/AppImage/AppImages/raw/master/functions.sh # Only downloads linuxdeploy if the remote file is different from local
. ./appimage_functions.sh if [ -e "$APP_BUILD_DIR"/linuxdeploy-x86_64.AppImage ]; then
curl -Lo "$APP_BUILD_DIR"/linuxdeploy-x86_64.AppImage \
-z "$APP_BUILD_DIR"/linuxdeploy-x86_64.AppImage \
https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
else
curl -Lo "$APP_BUILD_DIR"/linuxdeploy-x86_64.AppImage \
https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
fi
# Copy desktop and icon file to AppDir for AppRun to pick them up. chmod +x "$APP_BUILD_DIR"/linuxdeploy-x86_64.AppImage
# get_apprun
# get_desktop # metainfo is not packaged automatically by linuxdeploy
cp "$ROOT_DIR/runtime/nvim.desktop" "$APP_DIR/"
cp "$ROOT_DIR/runtime/nvim.png" "$APP_DIR/"
mkdir "$APP_DIR/usr/share/metainfo/" mkdir "$APP_DIR/usr/share/metainfo/"
cp "$ROOT_DIR/runtime/nvim.appdata.xml" "$APP_DIR/usr/share/metainfo/" cp "$ROOT_DIR/runtime/nvim.appdata.xml" "$APP_DIR/usr/share/metainfo/"
cd "$APP_DIR" cd "$APP_DIR"
# copy dependencies
copy_deps
# Move the libraries to usr/bin
move_lib
# Delete stuff that should not go into the AppImage.
# Delete dangerous libraries; see
# https://github.com/AppImage/AppImages/blob/master/excludelist
delete_blacklisted
######################################################################## ########################################################################
# AppDir complete. Now package it as an AppImage. # AppDir complete. Now package it as an AppImage.
######################################################################## ########################################################################
@ -78,21 +73,24 @@ chmod 755 AppRun
cd "$APP_BUILD_DIR" # Get out of AppImage directory. cd "$APP_BUILD_DIR" # Get out of AppImage directory.
# Set the name of the file generated by appimage
export OUTPUT=nvim.appimage
# If it's a release generate the zsync file
if [ -n "$TAG" ]; then
export UPDATE_INFORMATION="gh-releases-zsync|neovim|neovim|$TAG|nvim.appimage.zsync"
fi
# Generate AppImage. # Generate AppImage.
# - Expects: $ARCH, $APP, $VERSION env vars # - Expects: $ARCH, $APP, $VERSION env vars
# - Expects: ./$APP.AppDir/ directory # - Expects: ./$APP.AppDir/ directory
# - Produces: ../out/$APP-$VERSION.glibc$GLIBC_NEEDED-$ARCH.AppImage # - Produces: ./nvim.appimage
if [ -n "$TAG" ]; then ./linuxdeploy-x86_64.AppImage --appdir $APP.AppDir -d $ROOT_DIR/runtime/nvim.desktop -i \
generate_type2_appimage -u "gh-releases-zsync|neovim|neovim|$TAG|nvim.appimage.zsync" "$ROOT_DIR/runtime/nvim.png" --output appimage
else
generate_type2_appimage
fi
# Moving the final executable to a different folder so it isn't in the # Moving the final executable to a different folder so it isn't in the
# way for a subsequent build. # way for a subsequent build.
mv "$ROOT_DIR"/out/*.AppImage* "$ROOT_DIR"/build/bin mv "$ROOT_DIR"/build/nvim.appimage* "$ROOT_DIR"/build/bin
# Remove the (now empty) folder the AppImage was built in
rmdir "$ROOT_DIR"/out
echo 'genappimage.sh: finished' echo 'genappimage.sh: finished'