Moved AppRunScript -> AppRun.

The AppImageKit supports a script in place of the AppRun binary.

2 files changed, 46 insertions, 42 deletions

diff --git a/build/linux64/AppRun b/build/linux64/AppRun
new file mode 100755
index 00000000..6ff9c88a
--- /dev/null
+++ b/build/linux64/AppRun
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+# This needs to be set to /home/username/AppImages/Install
+INSTALL_PREFIX=/home/tristan/AppImages/Install
+
+# Base environment variables
+LD_LIBRARY_PATH=${APPDIR}${INSTALL_PREFIX}/lib64:${APPDIR}${INSTALL_PREFIX}/lib:${LD_LIBRARY_PATH}
+PATH=${APPDIR}${INSTALL_PREFIX}/bin:${PATH}
+XDG_DATA_DIRS=${APPDIR}${INSTALL_PREFIX}/share:${XDG_DATA_DIRS}
+export LD_LIBRARY_PATH PATH XDG_DATA_DIRS
+
+# D-Bus, silence fatal warnings, libdbus is in the mix but we don't need a D-Bus environment for Glade
+DBUS_FATAL_WARNINGS=0
+export DBUS_FATAL_WARNINGS
+
+# Pango environment variables
+PANGO_RC_FILE=${APPDIR}/pangorc
+export PANGO_RC_FILE
+
+# GTK+/GIO/GdkPixbuf environment variables
+# http://askubuntu.com/questions/251712/how-can-i-install-a-gsettings-schema-without-root-privileges
+GSETTINGS_SCHEMA_DIR=${APPDIR}${INSTALL_PREFIX}/share/glib-2.0/schemas/:${GSETTINGS_SCHEMA_DIR}
+GDK_PIXBUF_MODULE_FILE=${APPDIR}${INSTALL_PREFIX}/lib64/gdk-pixbuf-2.0/2.10.0/loaders.cache
+GTK_PATH=${APPDIR}${INSTALL_PREFIX}/lib64/gtk-3.0
+GTK_DATA_PREFIX=${APPDIR}${INSTALL_PREFIX}
+GTK_THEME=Adwaita
+export GSETTINGS_SCHEMA_DIR GDK_PIXBUF_MODULE_FILE GTK_PATH GTK_DATA_PREFIX GTK_THEME
+
+# Glade environment variables
+GLADE_CATALOG_SEARCH_PATH=${APPDIR}${INSTALL_PREFIX}/share/glade/catalogs
+GLADE_MODULE_SEARCH_PATH=${APPDIR}${INSTALL_PREFIX}/lib64/glade/modules
+GLADE_PIXMAP_DIR=${APPDIR}${INSTALL_PREFIX}/share/glade/pixmaps
+GLADE_BUNDLED=1
+export GLADE_CATALOG_SEARCH_PATH GLADE_MODULE_SEARCH_PATH GLADE_PIXMAP_DIR GLADE_BUNDLED
+
+# Currently we change into the APPDIR directory, this only because of gdk-pixbuf
+# and pango cache files which need to specify relative paths.
+cd ${APPDIR}
+
+if test -z ${APP_IMAGE_TEST}; then
+# Invoke Glade with the arguments passed
+    ${APPDIR}${INSTALL_PREFIX}/bin/glade $*
+else
+# Run a shell in test mode
+    bash;
+fi
diff --git a/build/linux64/AppRunScript.sh b/build/linux64/AppRunScript.sh
deleted file mode 100755
index 54de8467..00000000
--- a/build/linux64/AppRunScript.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# This needs to be set to /home/username/AppImages/Install
-INSTALL_PREFIX=/home/tristan/AppImages/Install
-
-# Base environment variables
-LD_LIBRARY_PATH=${APP_IMAGE_ROOT}${INSTALL_PREFIX}/lib64:${APP_IMAGE_ROOT}${INSTALL_PREFIX}/lib:${LD_LIBRARY_PATH}
-PATH=${APP_IMAGE_ROOT}${INSTALL_PREFIX}/bin:${PATH}
-XDG_DATA_DIRS=${APP_IMAGE_ROOT}${INSTALL_PREFIX}/share:${XDG_DATA_DIRS}
-export LD_LIBRARY_PATH PATH XDG_DATA_DIRS
-
-# D-Bus, silence fatal warnings, libdbus is in the mix but we don't need a D-Bus environment for Glade
-DBUS_FATAL_WARNINGS=0
-export DBUS_FATAL_WARNINGS
-
-# Pango environment variables
-PANGO_RC_FILE=${APP_IMAGE_ROOT}/pangorc
-export PANGO_RC_FILE
-
-# GTK+/GIO/GdkPixbuf environment variables
-# http://askubuntu.com/questions/251712/how-can-i-install-a-gsettings-schema-without-root-privileges
-GSETTINGS_SCHEMA_DIR=${APP_IMAGE_ROOT}${INSTALL_PREFIX}/share/glib-2.0/schemas/:${GSETTINGS_SCHEMA_DIR}
-GDK_PIXBUF_MODULE_FILE=${APP_IMAGE_ROOT}${INSTALL_PREFIX}/lib64/gdk-pixbuf-2.0/2.10.0/loaders.cache
-GTK_PATH=${APP_IMAGE_ROOT}${INSTALL_PREFIX}/lib64/gtk-3.0
-GTK_DATA_PREFIX=${APP_IMAGE_ROOT}${INSTALL_PREFIX}
-GTK_THEME=Adwaita
-export GSETTINGS_SCHEMA_DIR GDK_PIXBUF_MODULE_FILE GTK_PATH GTK_DATA_PREFIX GTK_THEME
-
-# Glade environment variables
-GLADE_CATALOG_SEARCH_PATH=${APP_IMAGE_ROOT}${INSTALL_PREFIX}/share/glade/catalogs
-GLADE_MODULE_SEARCH_PATH=${APP_IMAGE_ROOT}${INSTALL_PREFIX}/lib64/glade/modules
-GLADE_PIXMAP_DIR=${APP_IMAGE_ROOT}${INSTALL_PREFIX}/share/glade/pixmaps
-GLADE_BUNDLED=1
-export GLADE_CATALOG_SEARCH_PATH GLADE_MODULE_SEARCH_PATH GLADE_PIXMAP_DIR GLADE_BUNDLED
-
-if test -z ${APP_IMAGE_TEST}; then
-# Invoke Glade with the arguments passed
-    ${APP_IMAGE_ROOT}${INSTALL_PREFIX}/bin/glade $*
-else
-# Run a shell in test mode
-    bash;
-fi