From be38c932630390cfeec074e52a65b718000ebd3f Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Fri, 10 May 2019 15:04:36 +0200
Subject: [PATCH] fix adminer download

---
 install                 |  7 +++++++
 wo/cli/plugins/stack.py | 11 +++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/install b/install
index 0d5e9b7..7e94432 100755
--- a/install
+++ b/install
@@ -170,9 +170,16 @@ wo_install_dep() {
 
     {
         if [ "$wo_linux_distro" == "Ubuntu" ]; then
+            wget https://download.opensuse.org/repositories/home:virtubox:WordOps/xUbuntu_"$wo_distro_id"/Release.key -O Release.key
+            apt-key add - < Release.key
+            rm -f Release.key
             DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install build-essential curl gzip python3 python3-apt python3-setuptools python3-dev sqlite3 git tar software-properties-common pigz gnupg2 cron ccze rsync tree haveged ufw > /dev/null 2>&1
         else
+            wget https://download.opensuse.org/repositories/home:virtubox:WordOps/Debian_9.0/Release.key -O Release.key
+            apt-key add - < Release.key
+            rm -f Release.key
             [ -d /etc/apt/trusted.gpg.d ] && { wget -qO /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg; }
+
             DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install build-essential curl gzip dirmngr sudo python3 python3-apt python3-setuptools python3-dev ca-certificates sqlite3 git tar software-properties-common pigz apt-transport-https gnupg2 cron ccze rsync tree haveged ufw > /dev/null 2>&1
         fi
 
diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py
index 14cb867..a9c05a6 100644
--- a/wo/cli/plugins/stack.py
+++ b/wo/cli/plugins/stack.py
@@ -1153,7 +1153,8 @@ class WOStackController(CementBaseController):
             if any('/var/lib/wo/tmp/composer-install' == x[1]
                    for x in packages):
                 Log.info(self, "Installing composer, please wait...")
-                WOShellExec.cmd_exec(self, "php -q /var/lib/wo/tmp/composer-install "
+                WOShellExec.cmd_exec(self, "php -q /var/lib/wo"
+                                     "/tmp/composer-install "
                                      "--install-dir=/var/lib/wo/tmp/")
                 shutil.copyfile('/var/lib/wo/tmp/composer.phar',
                                 '/usr/local/bin/composer')
@@ -1168,7 +1169,8 @@ class WOStackController(CementBaseController):
                 if ((not os.path.exists('/opt/netdata')) and
                         (not os.path.exists('/etc/netdata'))):
                     Log.info(self, "Installing Netdata, please wait...")
-                    WOShellExec.cmd_exec(self, "bash /var/lib/wo/tmp/kickstart.sh "
+                    WOShellExec.cmd_exec(self, "bash /var/lib/wo/tmp/"
+                                         "kickstart.sh "
                                          "--dont-wait")
                     # disable mail notifications
                     WOFileUtils.searchreplace(self, "/opt/netdata/usr/"
@@ -1561,8 +1563,9 @@ class WOStackController(CementBaseController):
             # ADMINER
             if self.app.pargs.adminer:
                 Log.debug(self, "Setting packages variable for Adminer ")
-                packages = packages + [["https://www.adminer.org/static/"
-                                        "download/{0}/adminer-{0}.php"
+                packages = packages + [["https://github.com/vrana/adminer/"
+                                        "releases/download/v{0}"
+                                        "/adminer-{0}.php"
                                         .format(WOVariables.wo_adminer),
                                         "{0}22222/"
                                         "htdocs/db/adminer/index.php"