add sles 12 to pkgr.yml and check for used initservioce in pkgr-posti…

…nstall.sh fixes
maniacs-oss · Oct 27, 2016 · 159d1fc · 159d1fc
1 parent ff59c92
commit 159d1fc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/.pkgr.yml b/.pkgr.yml
@@ -18,7 +18,7 @@ targets:
   ubuntu-16.04:
     dependencies:
       - postgresql
-  sles-12
+  sles-12:
     dependencies:
       - postgresql
 before:

diff --git a/Gemfile.local from .pkgr.yml - packager.io complains about double use b/Gemfile.local from .pkgr.yml - packager.io complains about double use
diff --git a/contrib/pkgr-postinstall.sh b/contrib/pkgr-postinstall.sh
@@ -10,13 +10,10 @@ DB="zammad_production"
 DB_USER="zammad"
 
 # check which init system is used
-SYSTEMD="$(which systemd)"
-UPSTART="$(which initctl)"
-
-if [ -n ${UPSTART} ]; then
-    INIT_COMMAND="initctl"
-elif [ -n ${SYSTEMD} ]; then
-    INIT_CMD="systemd"
+if [ -n "$(which initctl)" ]; then
+    INIT_CMD="initctl"
+elif [ -n "$(which systemctl)" ]; then
+    INIT_CMD="systemctl"
 else
     function sysvinit () {
 	service $2 $1