Fix usage of linuxdeploy

AppImageCommunity · Sep 5, 2018 · c71ebf5 · c71ebf5
1 parent 6a4e4e7
commit c71ebf5
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/resources/build-appimages.sh b/resources/build-appimages.sh
@@ -26,6 +26,8 @@ OLD_CWD=$(readlink -f .)
 
 pushd "$BUILD_DIR"
 
+export ARCH=${ARCH:-$(uname -m)}
+
 if [ "$ARCH" == "i386" ]; then
     EXTRA_CMAKE_ARGS=("-DCMAKE_TOOLCHAIN_FILE=$REPO_ROOT/cmake/toolchains/i386-linux-gnu.cmake")
 fi
@@ -43,9 +45,7 @@ make install DESTDIR=appimageupdatetool.AppDir
 
 # install resources into AppDirs
 for appdir in AppImageUpdate.AppDir appimageupdatetool.AppDir; do
-    mkdir -p "$appdir"/usr/share/{applications,icons/hicolor/scalable/apps/} "$appdir"/resources
-    cp -v "$REPO_ROOT"/resources/*.desktop "$appdir"/usr/share/applications/
-    cp -v "$REPO_ROOT"/resources/*.svg "$appdir"/usr/share/icons/hicolor/scalable/apps/
+    mkdir -p "$appdir"/resources
     cp -v "$REPO_ROOT"/resources/*.xpm "$appdir"/resources/
 done
 
@@ -83,7 +83,7 @@ for app in appimageupdatetool AppImageUpdate; do
     if [ "$app" == "AppImageUpdate" ]; then export EXTRA_FLAGS=("--plugin" "qt"); fi
 
     # bundle application
-    ./linuxdeploy-"$ARCH".AppImage --appdir "$app".AppDir --output appimage "${EXTRA_FLAGS[@]}"
+    ./linuxdeploy-"$ARCH".AppImage --appdir "$app".AppDir --output appimage "${EXTRA_FLAGS[@]}" -d "$REPO_ROOT"/resources/"$app".desktop -i "$REPO_ROOT"/resources/AppImage.svg
 done
 
 # move AppImages to old cwd