From 568f518feb9c48b557d07923432c5fcd5b79b7c4 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sat, 24 Feb 2018 21:38:02 -0500
Subject: Be more general about environment

* Allow any Ubuntu 14.04, not specifically 14.04.5
* Work properly if not running in Travis CI
---
 appimage/build-appimage | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'appimage/build-appimage')

diff --git a/appimage/build-appimage b/appimage/build-appimage
index d51a4052..0ea3f783 100755
--- a/appimage/build-appimage
+++ b/appimage/build-appimage
@@ -49,7 +49,7 @@ fi
 _osversion=$(cat /etc/os-release | grep PRETTY_NAME | awk -F'=' '{print $2}' | sed 's#"##g')
 
 # Warn users building the AppImage locally:
-if [ x"$_osversion" != x"Ubuntu 14.04.5 LTS" ] ; then
+if [[ ! $_osversion =~ Ubuntu\ 14.04.*\ LTS ]]; then
 set +x
     echo ""
     #    0         1         2         3         4         5         6         7
@@ -160,7 +160,7 @@ unset QTDIR; unset QT_PLUGIN_PATH; unset LD_LIBRARY_PATH
 rm appdir/AppRun; cp $top/appimage/AppRun appdir; chmod a+x appdir/AppRun
 
 # If we are not on Ubuntu Trusty, we need to disable 'appstreamcli' validation:
-if [ x"$_osversion" == x"Ubuntu 14.04.5 LTS" ] ; then
+if [[ $_osversion =~ Ubuntu\ 14.04.*\ LTS ]]; then
     appimagetool_param=""
 else
     appimagetool_param="-n"
@@ -177,7 +177,11 @@ fi
 
 # Set up a version string to include in the AppImage name
 MAJOR_QPDF_VERSION=$( ./appdir/usr/bin/qpdf --version | grep "qpdf version" | awk '{print $3}' )
-VERSION=${MAJOR_QPDF_VERSION}-continuous-${TRAVIS_JOB_NUMBER}-$(date "+%Y-%m-%d")-git.$(git rev-parse --short HEAD)-x86_64
+if [ "$TRAVIS_JOB_NUMBER" != "" ]; then
+    VERSION=${MAJOR_QPDF_VERSION}-continuous-${TRAVIS_JOB_NUMBER}-$(date "+%Y-%m-%d")-git.$(git rev-parse --short HEAD)
+else
+    VERSION=${MAJOR_QPDF_VERSION}
+fi
 
 # Remove the default AppRun/symlink and use our own custom AppRun script
 rm appdir/AppRun; cp $top/appimage/AppRun appdir; chmod a+x appdir/AppRun
-- 
cgit v1.2.3-54-g00ecf