From 5f9407dea52850ccd597139c907910dd00751cc7 Mon Sep 17 00:00:00 2001
From: Dominique Roux <dominique.roux4@gmail.com>
Date: Mon, 20 Nov 2017 17:23:45 +0100
Subject: [PATCH] bugfixes

---
 gencode-remote | 13 ++++++-------
 manifest       |  9 +++++++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/gencode-remote b/gencode-remote
index 918dc2e..070421a 100755
--- a/gencode-remote
+++ b/gencode-remote
@@ -3,12 +3,6 @@
 os=$(cat "$__global/explorer/os")
 os_version=$(cat "$__global/explorer/os_version")
 
-# remove this check, if there is support for othere OS
-if [ ! "$os" = "debian" ]; then
-    echo "OS $os is currently not supported." >&2
-    exit 1
-fi
-
 case "$os" in
     centos)
         restart="/etc/init.d/nginx reload"
@@ -54,7 +48,12 @@ domain=$(cat "$__object/parameter/domain")
 
 # TODO check shasum of tar ball 
 cat <<eof
-INSTALL_STATE=\$([ -d /var/www/nextcloud ] && cd /var/www/nextcloud && sudo -u www-data php occ status| grep -o true)
+if [ -d /var/www/nextcloud -a \$(cd /var/www/nextcloud; sudo -u www-data php occ status | grep -o true) ]; then
+    INSTALL_STATE=true
+else
+    INSTALL_STATE=false
+fi
+echo \${INSTALL_STATE} > /tmp/install-state
 if [ "\$INSTALL_STATE" != "true" ]; then
     curl -s -L ${nextcloud_uri} -o /tmp/nextcloud.tar.bz2 
     tar -C /var/www -xvjf /tmp/nextcloud.tar.bz2 
diff --git a/manifest b/manifest
index c3de33e..344d7f8 100755
--- a/manifest
+++ b/manifest
@@ -19,7 +19,7 @@
 #
 
 os=$(cat "$__global/explorer/os")
-if [ ! "$os" = "debian" ]
+if [ ! "$os" = "debian"  -a  ! "$os" = "devuan" ]
 then
     echo "OS $os is currently not supported." >&2
     exit 1
@@ -29,6 +29,9 @@ case "$os_version" in
     8*)
         :
     ;;
+    jessie*)
+        :
+    ;;
     *)
         echo "Unsupported version $os_version of $os." >&2
         exit 1
@@ -38,7 +41,9 @@ esac
 db_pass=$(cat "$__object/parameter/db-pass")
 db_user=$(cat "$__object/parameter/db-user")
 db_name=$(cat "$__object/parameter/db-name")
-db_name=$(cat "$__object/parameter/domain")
+domain=$(cat "$__object/parameter/domain")
+
+
 
 # Hostname
 __hostname --name "$domain"