summary refs log tree commit diff
path: root/.ci/linux
diff options
context:
space:
mode:
authorzapashcanon <leo@ndrs.fr>2019-04-24 01:55:05 +0200
committerzapashcanon <leo@ndrs.fr>2019-04-24 01:55:05 +0200
commiteee6f2de31bb01bda96597a5236fc4b2dc668ff4 (patch)
treecdbf798b78024df70262971c6858d1342ea8d019 /.ci/linux
parentUpdate olm repo to new location. (diff)
downloadnheko-eee6f2de31bb01bda96597a5236fc4b2dc668ff4.tar.xz
improve shell scripts and update .gitignore
Diffstat (limited to '.ci/linux')
-rwxr-xr-x.ci/linux/deploy.sh33
1 files changed, 22 insertions, 11 deletions
diff --git a/.ci/linux/deploy.sh b/.ci/linux/deploy.sh
index 0fd23808..b8c1c5e3 100755
--- a/.ci/linux/deploy.sh
+++ b/.ci/linux/deploy.sh
@@ -1,13 +1,17 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
-set -ex
+set -eux
 
 APP=nheko
 DIR=${APP}.AppDir
-TAG=`git tag -l --points-at HEAD`
+# unused but may be useful...
+#TAG=$(git tag -l --points-at HEAD)
 
 # Set up AppImage structure.
-mkdir -p ${DIR}/usr/{bin,lib,share/pixmaps,share/applications}
+for d in bin lib share/pixmaps share/applications
+do
+    mkdir -p ${DIR}/usr/$d
+done
 
 # Copy resources.
 cp build/nheko ${DIR}/usr/bin
@@ -27,19 +31,26 @@ fi
 chmod a+x linuxdeployqt*.AppImage
 
 unset QTDIR
-unset QT_PLUGIN_PATH 
+unset QT_PLUGIN_PATH
 unset LD_LIBRARY_PATH
 
-export ARCH=$(uname -m)
-export LD_LIBRARY_PATH=$(pwd)/.deps/usr/lib/:$LD_LIBRARY_PATH
+ARCH=$(uname -m)
+export ARCH
+LD_LIBRARY_PATH=$(pwd)/.deps/usr/lib/:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH
+
+for res in ./linuxdeployqt*.AppImage
+do
+    linuxdeployqt=$res
+done
 
-./linuxdeployqt*.AppImage ${DIR}/usr/share/applications/*.desktop -unsupported-allow-new-glibc -bundle-non-qt-libs
-./linuxdeployqt*.AppImage ${DIR}/usr/share/applications/*.desktop -unsupported-allow-new-glibc -appimage
+./"$linuxdeployqt" ${DIR}/usr/share/applications/*.desktop -unsupported-allow-new-glibc -bundle-non-qt-libs
+./"$linuxdeployqt" ${DIR}/usr/share/applications/*.desktop -unsupported-allow-new-glibc -appimage
 
 chmod +x nheko-*x86_64.AppImage
 
-if [ ! -z $VERSION ]; then
+if [ ! -z "$VERSION" ]; then
     # commented out for now, as AppImage file appears to already contain the version.
     #mv nheko-*x86_64.AppImage nheko-${VERSION}-x86_64.AppImage
     echo "nheko-${VERSION}-x86_64.AppImage"
-fi
\ No newline at end of file
+fi