Modified AppImage build method (#294)

create_appimage.sh

@@ -3,8 +3,7 @@ if [[ "$BUILDARCH" == "x64" ]]; then
  # install a dep needed for this process
  sudo apt-get install desktop-file-utils
 
- # download pkg2appimage from github
- curl -LO "https://github.com/AppImage/pkg2appimage/raw/master/pkg2appimage"
+ cd ..
 
- bash -e pkg2appimage ../VSCodium-AppImage-Recipe.yml
+ bash -e src/resources/linux/appimage/pkg2appimage VSCodium-AppImage-Recipe.yml
 fi

src/resources/linux/appimage/AppRun

@@ -0,0 +1,11 @@
+#!/bin/sh
+HERE="$(dirname "$(readlink -f "${0}")")"
+export UNION_PRELOAD="${HERE}"
+export PATH="${HERE}"/usr/bin/:"${HERE}"/usr/sbin/:"${HERE}"/usr/games/:"${HERE}"/bin/:"${HERE}"/sbin/:"${PATH}"
+export LD_LIBRARY_PATH="${HERE}"/usr/lib/:"${HERE}"/usr/lib/i386-linux-gnu/:"${HERE}"/usr/lib/x86_64-linux-gnu/:"${HERE}"/usr/lib32/:"${HERE}"/usr/lib64/:"${HERE}"/lib/:"${HERE}"/lib/i386-linux-gnu/:"${HERE}"/lib/x86_64-linux-gnu/:"${HERE}"/lib32/:"${HERE}"/lib64/:"${LD_LIBRARY_PATH}"
+export XDG_DATA_DIRS="${HERE}"/usr/share/:"${XDG_DATA_DIRS}"
+export PERLLIB="${HERE}"/usr/share/perl5/:"${HERE}"/usr/lib/perl5/:"${PERLLIB}"
+export GSETTINGS_SCHEMA_DIR="${HERE}"/usr/share/glib-2.0/schemas/:"${GSETTINGS_SCHEMA_DIR}"
+export QT_PLUGIN_PATH="${HERE}"/usr/lib/qt4/plugins/:"${HERE}"/usr/lib/i386-linux-gnu/qt4/plugins/:"${HERE}"/usr/lib/x86_64-linux-gnu/qt4/plugins/:"${HERE}"/usr/lib32/qt4/plugins/:"${HERE}"/usr/lib64/qt4/plugins/:"${HERE}"/usr/lib/qt5/plugins/:"${HERE}"/usr/lib/i386-linux-gnu/qt5/plugins/:"${HERE}"/usr/lib/x86_64-linux-gnu/qt5/plugins/:"${HERE}"/usr/lib32/qt5/plugins/:"${HERE}"/usr/lib64/qt5/plugins/:"${QT_PLUGIN_PATH}"
+EXEC=$(grep -e '^Exec=.*' "${HERE}"/*.desktop | head -n 1 | cut -d "=" -f 2- | sed -e 's|%.||g')
+exec ${EXEC} "$@"

src/resources/linux/appimage/functions.sh

@@ -0,0 +1,349 @@
+# This file is supposed to be sourced by each Recipe
+# that wants to use the functions contained herein
+# like so:
+# wget -q https://github.com/AppImage/AppImages/raw/${PKG2AICOMMIT}/functions.sh -O ./functions.sh
+# . ./functions.sh
+
+# RECIPE=$(realpath "$0")
+
+# Specify a certain commit if you do not want to use master
+# by using:
+# export PKG2AICOMMIT=<git sha>
+if [ -z "$PKG2AICOMMIT" ] ; then
+ PKG2AICOMMIT=master
+fi
+
+# Options for apt-get to use local files rather than the system ones
+OPTIONS="-o Debug::NoLocking=1
+-o APT::Cache-Limit=125829120
+-o Dir::Etc::sourcelist=./sources.list
+-o Dir::State=./tmp
+-o Dir::Cache=./tmp
+-o Dir::State::status=./status
+-o Dir::Etc::sourceparts=-
+-o APT::Get::List-Cleanup=0
+-o APT::Get::AllowUnauthenticated=1
+-o Debug::pkgProblemResolver=true
+-o Debug::pkgDepCache::AutoInstall=true
+-o APT::Install-Recommends=0
+-o APT::Install-Suggests=0
+"
+
+# Detect if we are running inside Docker
+grep docker /proc/1/cgroup >/dev/null && export DOCKER_BUILD=1 || true
+
+# Detect system architecture to know which binaries of AppImage tools
+# should be downloaded and used.
+case "$(uname -i)" in
+ x86_64|amd64)
+# echo "x86-64 system architecture"
+ SYSTEM_ARCH="x86_64";;
+ i?86)
+# echo "x86 system architecture"
+ SYSTEM_ARCH="i686";;
+# arm*)
+# echo "ARM system architecture"
+# SYSTEM_ARCH="";;
+ unknown|AuthenticAMD|GenuineIntel)
+# uname -i not answer on debian, then:
+ case "$(uname -m)" in
+ x86_64|amd64)
+# echo "x86-64 system architecture"
+ SYSTEM_ARCH="x86_64";;
+ i?86)
+# echo "x86 system architecture"
+ SYSTEM_ARCH="i686";;
+ esac ;;
+ *)
+ echo "Unsupported system architecture"
+ exit 1;;
+esac
+
+# Either get the file from remote or from a static place.
+# critical for builds without network access like in Open Build Service
+cat_file_from_url()
+{
+ cat_excludelist="wget -q $1 -O -"
+ [ -e "$STATIC_FILES/${1##*/}" ] && cat_excludelist="cat $STATIC_FILES/${1##*/}"
+ $cat_excludelist
+}
+
+git_pull_rebase_helper()
+{
+ git reset --hard HEAD
+ git pull
+}
+
+# Patch /usr to ././ in ./usr
+# to make the contents of usr/ relocateable
+# (this requires us to cd ./usr before running the application; AppRun does that)
+patch_usr()
+{
+ find usr/ -type f -executable -exec sed -i -e "s|/usr|././|g" {} \;
+}
+
+# Download AppRun and make it executable
+get_apprun()
+{
+ cp ${HERE}/AppRun .
+ chmod a+x AppRun
+}
+
+# Copy the library dependencies of all exectuable files in the current directory
+# (it can be beneficial to run this multiple times)
+copy_deps()
+{
+ PWD=$(readlink -f .)
+ FILES=$(find . -type f -executable -or -name *.so.* -or -name *.so | sort | uniq )
+ for FILE in $FILES ; do
+ ldd "${FILE}" | grep "=>" | awk '{print $3}' | xargs -I '{}' echo '{}' >> DEPSFILE
+ done
+ DEPS=$(cat DEPSFILE | sort | uniq)
+ for FILE in $DEPS ; do
+ if [ -e $FILE ] && [[ $(readlink -f $FILE)/ != $PWD/* ]] ; then
+ cp -v --parents -rfL $FILE ./ || true
+ fi
+ done
+ rm -f DEPSFILE
+}
+
+# Move ./lib/ tree to ./usr/lib/
+move_lib()
+{
+ mkdir -p ./usr/lib ./lib && find ./lib/ -exec cp -v --parents -rfL {} ./usr/ \; && rm -rf ./lib
+ mkdir -p ./usr/lib ./lib64 && find ./lib64/ -exec cp -v --parents -rfL {} ./usr/ \; && rm -rf ./lib64
+}
+
+# Delete blacklisted files
+delete_blacklisted()
+{
+ BLACKLISTED_FILES=$(cat_file_from_url https://github.com/AppImage/pkg2appimage/raw/${PKG2AICOMMIT}/excludelist | sed 's|#.*||g')
+ echo $BLACKLISTED_FILES
+ for FILE in $BLACKLISTED_FILES ; do
+ FILES="$(find . -name "${FILE}" -not -path "./usr/optional/*")"
+ for FOUND in $FILES ; do
+ rm -vf "$FOUND" "$(readlink -f "$FOUND")"
+ done
+ done
+
+ # Do not bundle developer stuff
+ rm -rf usr/include || true
+ rm -rf usr/lib/cmake || true
+ rm -rf usr/lib/pkgconfig || true
+ find . -name '*.la' | xargs -i rm {}
+}
+
+# Echo highest glibc version needed by the executable files in the current directory
+glibc_needed()
+{
+ find . -name *.so -or -name *.so.* -or -type f -executable -exec strings {} \; | grep ^GLIBC_2 | sed s/GLIBC_//g | sort --version-sort | uniq | tail -n 1
+ # find . -name *.so -or -name *.so.* -or -type f -executable -exec readelf -s '{}' 2>/dev/null \; | sed -n 's/.*@GLIBC_//p'| awk '{print $1}' | sort --version-sort | tail -n 1
+}
+# Add desktop integration
+# Usage: get_desktopintegration name_of_desktop_file_and_exectuable
+get_desktopintegration()
+{
+ # REALBIN=$(grep -o "^Exec=.*" *.desktop | sed -e 's|Exec=||g' | cut -d " " -f 1 | head -n 1)
+ # cat_file_from_url https://raw.githubusercontent.com/AppImage/AppImageKit/deprecated/AppImageAssistant/desktopintegration > ./usr/bin/$REALBIN.wrapper
+ # chmod a+x ./usr/bin/$REALBIN.wrapper
+ echo "The desktopintegration script is deprecated. Please advise users to use https://github.com/AppImage/appimaged instead."
+ # sed -i -e "s|^Exec=$REALBIN|Exec=$REALBIN.wrapper|g" $1.desktop
+}
+
+# Generate AppImage; this expects $ARCH, $APP and $VERSION to be set
+generate_appimage()
+{
+ # Download AppImageAssistant
+ URL="https://github.com/AppImage/AppImageKit/releases/download/6/AppImageAssistant_6-${SYSTEM_ARCH}.AppImage"
+ wget -c "$URL" -O AppImageAssistant
+ chmod a+x ./AppImageAssistant
+
+ # if [[ "$RECIPE" == *ecipe ]] ; then
+ # echo "#!/bin/bash -ex" > ./$APP.AppDir/Recipe
+ # echo "# This recipe was used to generate this AppImage." >> ./$APP.AppDir/Recipe
+ # echo "# See http://appimage.org for more information." >> ./$APP.AppDir/Recipe
+ # echo "" >> ./$APP.AppDir/Recipe
+ # cat $RECIPE >> ./$APP.AppDir/Recipe
+ # fi
+ #
+ # Detect the architecture of what we are packaging.
+ # The main binary could be a script, so let's use a .so library
+ BIN=$(find . -name *.so* -type f | head -n 1)
+ INFO=$(file "$BIN")
+ if [ -z $ARCH ] ; then
+ if [[ $INFO == *"x86-64"* ]] ; then
+ ARCH=x86_64
+ elif [[ $INFO == *"i686"* ]] ; then
+ ARCH=i686
+ elif [[ $INFO == *"armv6l"* ]] ; then
+ ARCH=armhf
+ else
+ echo "Could not automatically detect the architecture."
+ echo "Please set the \$ARCH environment variable."
+ exit 1
+ fi
+ fi
+
+ mkdir -p ../out || true
+ rm ../out/$APP"-"$VERSION".glibc"$GLIBC_NEEDED"-"$ARCH".AppImage" 2>/dev/null || true
+ GLIBC_NEEDED=$(glibc_needed)
+ ./AppImageAssistant ./$APP.AppDir/ ../out/$APP"-"$VERSION".glibc"$GLIBC_NEEDED"-"$ARCH".AppImage"
+}
+
+# Generate AppImage type 2
+# Additional parameters given to this routine will be passed on to appimagetool
+#
+# If the environment variable NO_GLIBC_VERSION is set, the required glibc version
+# will not be added to the AppImage filename
+generate_type2_appimage()
+{
+ # Get the ID of the last successful build on Travis CI
+ # ID=$(wget -q https://api.travis-ci.org/repos/AppImage/appimagetool/builds -O - | head -n 1 | sed -e 's|}|\n|g' | grep '"result":0' | head -n 1 | sed -e 's|,|\n|g' | grep '"id"' | cut -d ":" -f 2)
+ # Get the transfer.sh URL from the logfile of the last successful build on Travis CI
+ # Only Travis knows why build ID and job ID don't match and why the above doesn't give both...
+ # URL=$(wget -q "https://s3.amazonaws.com/archive.travis-ci.org/jobs/$((ID+1))/log.txt" -O - | grep "https://transfer.sh/.*/appimagetool" | tail -n 1 | sed -e 's|\r||g')
+ # if [ -z "$URL" ] ; then
+ # URL=$(wget -q "https://s3.amazonaws.com/archive.travis-ci.org/jobs/$((ID+2))/log.txt" -O - | grep "https://transfer.sh/.*/appimagetool" | tail -n 1 | sed -e 's|\r||g')
+ # fi
+ if [ -z "$(which appimagetool)" ] ; then
+ URL="https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-${SYSTEM_ARCH}.AppImage"
+ wget -c "$URL" -O appimagetool
+ chmod a+x ./appimagetool
+ appimagetool=$(readlink -f appimagetool)
+ else
+ appimagetool=$(which appimagetool)
+ fi
+ if [ "$DOCKER_BUILD" ]; then
+ appimagetool_tempdir=$(mktemp -d)
+ mv appimagetool "$appimagetool_tempdir"
+ pushd "$appimagetool_tempdir" &>/dev/null
+ ls -al
+ ./appimagetool --appimage-extract
+ rm appimagetool
+ appimagetool=$(readlink -f squashfs-root/AppRun)
+ popd &>/dev/null
+ _appimagetool_cleanup() { [ -d "$appimagetool_tempdir" ] && rm -r "$appimagetool_tempdir"; }
+ trap _appimagetool_cleanup EXIT
+ fi
+
+ if [ -z ${NO_GLIBC_VERSION+true} ]; then
+ GLIBC_NEEDED=$(glibc_needed)
+ VERSION_EXPANDED=$VERSION.glibc$GLIBC_NEEDED
+ else
+ VERSION_EXPANDED=$VERSION
+ fi
+
+ set +x
+ GLIBC_NEEDED=$(glibc_needed)
+ if ( [ ! -z "$KEY" ] ) && ( ! -z "$TRAVIS" ) ; then
+ wget https://github.com/AppImage/AppImageKit/files/584665/data.zip -O data.tar.gz.gpg
+ ( set +x ; echo $KEY | gpg2 --batch --passphrase-fd 0 --no-tty --skip-verify --output data.tar.gz --decrypt data.tar.gz.gpg )
+ tar xf data.tar.gz
+ sudo chown -R $USER .gnu*
+ mv $HOME/.gnu* $HOME/.gnu_old ; mv .gnu* $HOME/
+ VERSION=$VERSION_EXPANDED "$appimagetool" $@ -n -s --bintray-user $BINTRAY_USER --bintray-repo $BINTRAY_REPO -v ./$APP.AppDir/
+ else
+ VERSION=$VERSION_EXPANDED "$appimagetool" $@ -n --bintray-user $BINTRAY_USER --bintray-repo $BINTRAY_REPO -v ./$APP.AppDir/
+ fi
+ set -x
+ mkdir -p ../out/ || true
+ mv *.AppImage* ../out/
+}
+
+# Generate status file for use by apt-get; assuming that the recipe uses no newer
+# ingredients than what would require more recent dependencies than what we assume
+# to be part of the base system
+generate_status()
+{
+ mkdir -p ./tmp/archives/
+ mkdir -p ./tmp/lists/partial
+ touch tmp/pkgcache.bin tmp/srcpkgcache.bin
+ if [ -e "${HERE}/usr/share/pkg2appimage/excludedeblist" ] ; then
+ EXCLUDEDEBLIST="${HERE}/usr/share/pkg2appimage/excludedeblist"
+ else
+ wget -q -c "https://github.com/AppImage/AppImages/raw/${PKG2AICOMMIT}/excludedeblist"
+ EXCLUDEDEBLIST=excludedeblist
+ fi
+ rm status 2>/dev/null || true
+ for PACKAGE in $(cat excludedeblist | cut -d "#" -f 1) ; do
+ printf "Package: $PACKAGE\nStatus: install ok installed\nArchitecture: all\nVersion: 9:999.999.999\n\n" >> status
+ done
+}
+
+# Find the desktop file and copy it to the AppDir
+get_desktop()
+{
+ find usr/share/applications -iname "*${LOWERAPP}.desktop" -exec cp {} . \; || true
+}
+
+fix_desktop() {
+ # fix trailing semicolons
+ for key in Actions Categories Implements Keywords MimeType NotShowIn OnlyShowIn; do
+ sed -i '/'"$key"'.*[^;]$/s/$/;/' $1
+ done
+}
+
+# Find the icon file and copy it to the AppDir
+get_icon()
+{
+ find ./usr/share/pixmaps/$LOWERAPP.png -exec cp {} . \; 2>/dev/null || true
+ find ./usr/share/icons -path *64* -name $LOWERAPP.png -exec cp {} . \; 2>/dev/null || true
+ find ./usr/share/icons -path *128* -name $LOWERAPP.png -exec cp {} . \; 2>/dev/null || true
+ find ./usr/share/icons -path *512* -name $LOWERAPP.png -exec cp {} . \; 2>/dev/null || true
+ find ./usr/share/icons -path *256* -name $LOWERAPP.png -exec cp {} . \; 2>/dev/null || true
+ ls -lh $LOWERAPP.png || true
+}
+
+# Find out the version
+get_version()
+{
+ THEDEB=$(find ../*.deb -name $LOWERAPP"_*" | head -n 1)
+ if [ -z "$THEDEB" ] ; then
+ echo "Version could not be determined from the .deb; you need to determine it manually"
+ fi
+ VERSION=$(echo $THEDEB | cut -d "~" -f 1 | cut -d "_" -f 2 | cut -d "-" -f 1 | sed -e 's|1%3a||g' | sed -e 's|.dfsg||g' )
+ echo $VERSION
+}
+
+# transfer.sh
+transfer() { if [ $# -eq 0 ]; then echo "No arguments specified. Usage:\necho transfer /tmp/test.md\ncat /tmp/test.md | transfer test.md"; return 1; fi
+tmpfile=$( mktemp -t transferXXX ); if tty -s; then basefile=$(basename "$1" | sed -e 's/[^a-zA-Z0-9._-]/-/g'); curl --progress-bar --upload-file "$1" "https://transfer.sh/$basefile" >> $tmpfile; else curl --progress-bar --upload-file "-" "https://transfer.sh/$1" >> $tmpfile ; fi; cat $tmpfile; rm -f $tmpfile; }
+
+# Patch binary files; fill with padding if replacement is shorter than original
+# http://everydaywithlinux.blogspot.de/2012/11/patch-strings-in-binary-files-with-sed.html
+# Example: patch_strings_in_file foo "/usr/local/lib/foo" "/usr/lib/foo"
+patch_strings_in_file() {
+ local FILE="$1"
+ local PATTERN="$2"
+ local REPLACEMENT="$3"
+ # Find all unique strings in FILE that contain the pattern
+ STRINGS=$(strings ${FILE} | grep ${PATTERN} | sort -u -r)
+ if [ "${STRINGS}" != "" ] ; then
+ echo "File '${FILE}' contain strings with '${PATTERN}' in them:"
+ for OLD_STRING in ${STRINGS} ; do
+ # Create the new string with a simple bash-replacement
+ NEW_STRING=${OLD_STRING//${PATTERN}/${REPLACEMENT}}
+ # Create null terminated ASCII HEX representations of the strings
+ OLD_STRING_HEX="$(echo -n ${OLD_STRING} | xxd -g 0 -u -ps -c 256)00"
+ NEW_STRING_HEX="$(echo -n ${NEW_STRING} | xxd -g 0 -u -ps -c 256)00"
+ if [ ${#NEW_STRING_HEX} -le ${#OLD_STRING_HEX} ] ; then
+ # Pad the replacement string with null terminations so the
+ # length matches the original string
+ while [ ${#NEW_STRING_HEX} -lt ${#OLD_STRING_HEX} ] ; do
+ NEW_STRING_HEX="${NEW_STRING_HEX}00"
+ done
+ # Now, replace every occurrence of OLD_STRING with NEW_STRING
+ echo -n "Replacing ${OLD_STRING} with ${NEW_STRING}... "
+ hexdump -ve '1/1 "%.2X"' ${FILE} | \
+ sed "s/${OLD_STRING_HEX}/${NEW_STRING_HEX}/g" | \
+ xxd -r -p > ${FILE}.tmp
+ chmod --reference ${FILE} ${FILE}.tmp
+ mv ${FILE}.tmp ${FILE}
+ echo "Done!"
+ else
+ echo "New string '${NEW_STRING}' is longer than old" \
+ "string '${OLD_STRING}'. Skipping."
+ fi
+ done
+ fi
+}