From 50bfdd43a2811e47771665178632bcf303b6bfd9 Mon Sep 17 00:00:00 2001
From: Dominique Roux <dominique.roux4@gmail.com>
Date: Fri, 13 Jul 2018 18:15:36 +0200
Subject: [PATCH] Bugfixes: - Manifest had some duplicated code - Manifest set
 the wrong distribution variable for the repository - Gencode-remote is still
 hacky, but works for the moment

---
 gencode-remote | 18 ++++++++++--------
 manifest       | 10 ++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/gencode-remote b/gencode-remote
index 2e5082a..249539d 100755
--- a/gencode-remote
+++ b/gencode-remote
@@ -45,13 +45,15 @@ admin_pass=$(cat "$__object/parameter/admin-pass")
 domain=$(cat "$__object/parameter/domain")
 
 # TODO check shasum of tar ball 
-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
+# TODO: Make this Work!!
+#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
+cat <<eof
     curl -s -L ${nextcloud_uri} -o /tmp/nextcloud.tar.bz2 
     tar -C /var/www -xvjf /tmp/nextcloud.tar.bz2 
     rm -f /tmp/nextcloud.tar.bz2 
@@ -59,5 +61,5 @@ if [ "\$INSTALL_STATE" != "true" ]; then
     cd /var/www/nextcloud
     sudo -u www-data php occ maintenance:install --database "pgsql" --database-name "$db_name" --database-user "$db_user" --database-pass "$db_pass" --admin-user "$admin_user" --admin-pass "$admin_pass"
     sudo -u www-data php occ config:system:set trusted_domains 2 --value="$domain"
-fi
 eof
+#fi
diff --git a/manifest b/manifest
index 671b763..c3504ad 100755
--- a/manifest
+++ b/manifest
@@ -27,12 +27,15 @@ fi
 os_version=$(cat "$__global/explorer/os_version")
 case "$os_version" in
     8*)
+        distribution="jessie"
         :
     ;;
     9*)
+        distribution="stretch"
         :
     ;;
     jessie*)
+        distribution="jessie"
         :
     ;;
     *)
@@ -51,16 +54,11 @@ domain=$(cat "$__object/parameter/domain")
 
 __apt_key_uri dotdeb --uri https://www.dotdeb.org/dotdeb.gpg
 require="__apt_key_uri/dotdeb" __apt_source dotdeb --uri http://packages.dotdeb.org \
-                                                   --distribution jessie \
+                                                   --distribution ${distribution} \
                                                    --component all
 
 require="__apt_source/dotdeb" __apt_update_index
 
-__apt_key_uri dotdeb --uri https://www.dotdeb.org/dotdeb.gpg
-require="__apt_key_uri/dotdeb" __apt_source dotdeb --uri http://packages.dotdeb.org \
-                                                   --distribution jessie \
-                                                   --component all
-
 # Install packages
 for package in php7.0-common php7.0-gd php7.0-json php7.0-pgsql php7.0-curl \
 			   php7.0-intl php7.0-mcrypt php7.0-imagick \