From 7ea0c30f98ceba954e4d9297996fe1c69f5549b5 Mon Sep 17 00:00:00 2001
From: Andreas Nilsen <adde88@gmail.com>
Date: Fri, 25 Oct 2019 04:11:54 +0200
Subject: [PATCH] Papers: Fixed dependencies scripts for latest fw 2.6.x (#83)

* Fixed dependencies scripts

Signed-off-by: Andreas Nilsen <adde88@gmail.com>

* Bump to v1.8

Signed-off-by: Andreas Nilsen <adde88@gmail.com>
---
 Papers/includes/changelog/Version 1.8     | 2 ++
 Papers/includes/scripts/checkDepends.sh   | 3 ++-
 Papers/includes/scripts/installDepends.sh | 9 ++++++---
 Papers/includes/scripts/removeDepends.sh  | 8 +++++---
 Papers/module.info                        | 4 ++--
 5 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 Papers/includes/changelog/Version 1.8

diff --git a/Papers/includes/changelog/Version 1.8 b/Papers/includes/changelog/Version 1.8
new file mode 100644
index 0000000..86358f8
--- /dev/null
+++ b/Papers/includes/changelog/Version 1.8	
@@ -0,0 +1,2 @@
+October 18, 2019<br /></br >
+- Fixed dependencies scripts to work with latest firmware<br />
diff --git a/Papers/includes/scripts/checkDepends.sh b/Papers/includes/scripts/checkDepends.sh
index 02c6e28..85fcb95 100755
--- a/Papers/includes/scripts/checkDepends.sh
+++ b/Papers/includes/scripts/checkDepends.sh
@@ -2,8 +2,9 @@
 
 testZip=$(opkg list-installed | grep -w 'zip')
 testUnzip=$(opkg list-installed | grep -w 'unzip')
+testNginxssl=$(opkg list-installed | grep -w 'nginx-ssl')
 
-if [ -z "$testZip" ]; then
+if [ -z "$testZip" -a -z "$testNginxssl" ]; then
 	echo "Not Installed";
 else
 	if [ -z "$testUnzip" ]; then
diff --git a/Papers/includes/scripts/installDepends.sh b/Papers/includes/scripts/installDepends.sh
index 9a2c8fe..7ad7e59 100755
--- a/Papers/includes/scripts/installDepends.sh
+++ b/Papers/includes/scripts/installDepends.sh
@@ -1,8 +1,11 @@
 #!/bin/sh
 
-#  Author: sud0nick
-#  Date:   Jan 2016
+#  Author: sud0nick & adde88
+#  Date:   18.10.2019
 
 opkg update > /dev/null;
-opkg install zip unzip > /dev/null;
+/etc/init.d/nginx stop > /dev/null;
+opkg remove nginx > /dev/null;
+opkg install zip unzip nginx-ssl > /dev/null;
+/etc/init.d/nginx restart > /dev/null;
 echo "Complete"
diff --git a/Papers/includes/scripts/removeDepends.sh b/Papers/includes/scripts/removeDepends.sh
index 044345b..ae8715f 100755
--- a/Papers/includes/scripts/removeDepends.sh
+++ b/Papers/includes/scripts/removeDepends.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-#  Author: sud0nick
-#  Date:   Jan 2016
+#  Author: sud0nick & adde88
+#  Date:   18.10.2019
 
-opkg remove zip unzip > /dev/null;
+/etc/init.d/nginx stop > /dev/null;
+opkg remove zip unzip nginx-ssl > /dev/null;
+opkg install nginx > /dev/null;
diff --git a/Papers/module.info b/Papers/module.info
index 157295b..a2924d8 100755
--- a/Papers/module.info
+++ b/Papers/module.info
@@ -6,5 +6,5 @@
         "tetra"
     ],
     "title": "Papers",
-    "version": "1.7"
-}
\ No newline at end of file
+    "version": "1.8"
+}