genappimage: Use AppImage/AppImages repo to avoid redirects

This commit is contained in:
James McCoy 2018-03-09 09:36:05 -05:00
parent d53aa0e94f
commit b0d08998f5
No known key found for this signature in database
GPG Key ID: DFE691AE331BA3DB

View File

@ -35,7 +35,7 @@ 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/probonopd/AppImages/raw/master/functions.sh curl -Lo "$APP_BUILD_DIR"/appimage_functions.sh https://github.com/AppImage/AppImages/raw/master/functions.sh
. ./appimage_functions.sh . ./appimage_functions.sh
# Copy desktop and icon file to AppDir for AppRun to pick them up. # Copy desktop and icon file to AppDir for AppRun to pick them up.
@ -53,7 +53,7 @@ move_lib
# Delete stuff that should not go into the AppImage. # Delete stuff that should not go into the AppImage.
# Delete dangerous libraries; see # Delete dangerous libraries; see
# https://github.com/probonopd/AppImages/blob/master/excludelist # https://github.com/AppImage/AppImages/blob/master/excludelist
delete_blacklisted delete_blacklisted
######################################################################## ########################################################################
@ -71,10 +71,8 @@ cd "$APP_BUILD_DIR" # Get out of AppImage directory.
# - Produces: ../out/$APP-$VERSION.glibc$GLIBC_NEEDED-$ARCH.AppImage # - Produces: ../out/$APP-$VERSION.glibc$GLIBC_NEEDED-$ARCH.AppImage
generate_appimage generate_appimage
# NOTE: There is currently a bug in the `generate_appimage` function (see # Moving the final executable to a different folder so it isn't in the
# https://github.com/probonopd/AppImages/issues/228) that causes repeated builds # way for a subsequent build.
# that result in the same name to fail.
# Moving the final executable to a different folder gets around this issue.
mv "$ROOT_DIR"/out/*.AppImage "$ROOT_DIR"/build/bin mv "$ROOT_DIR"/out/*.AppImage "$ROOT_DIR"/build/bin
# Remove the (now empty) folder the AppImage was built in # Remove the (now empty) folder the AppImage was built in