From 411da84e2234bf7e4fb5f2ecf058b806fe232fbe Mon Sep 17 00:00:00 2001
From: Daniel Hansson <github@techandme.se>
Date: Sun, 5 Aug 2018 16:56:56 +0200
Subject: [PATCH] Revert "fix adduser error (#595)" (#598)

This reverts commit c8ab757ffe4c5f3f5a32b8ed06a7576e3c12f977.
---
 nextcloud-startup-script.sh     | 2 +-
 nextcloud_install_production.sh | 2 +-
 static/adduser.sh               | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/nextcloud-startup-script.sh b/nextcloud-startup-script.sh
index c3a05f7b..ba02034d 100644
--- a/nextcloud-startup-script.sh
+++ b/nextcloud-startup-script.sh
@@ -153,7 +153,7 @@ Please create a user with sudo permissions and the run this command:
 sudo -u [user-with-sudo-permissions] sudo bash /var/scripts/nextcloud-startup-script.sh
 
 We will do this for you when you hit OK."
-       run_static_script adduser nextcloud-startup-script
+       run_static_script adduser $SCRIPTS/nextcloud-startup-script.sh
        else
 msg_box "You probably see this message if the user 'ncadmin' does not exist on the system,
 which could be the case if you are running directly from the scripts and not the VM.
diff --git a/nextcloud_install_production.sh b/nextcloud_install_production.sh
index 5b521990..1dc212c4 100644
--- a/nextcloud_install_production.sh
+++ b/nextcloud_install_production.sh
@@ -66,7 +66,7 @@ ram_check 2 Nextcloud
 cpu_check 1 Nextcloud
 
 # Create new current user
-run_static_script adduser nextcloud_install_production
+run_static_script adduser nextcloud_install_production.sh
 
 # Check distrobution and version
 check_distro_version
diff --git a/static/adduser.sh b/static/adduser.sh
index a2f26341..513aae50 100644
--- a/static/adduser.sh
+++ b/static/adduser.sh
@@ -34,7 +34,6 @@ The preferred user is 'ncadmin'."
         do
             sudo passwd "$NEWUSER" && break
         done
-        download_static_script "$1"
-        sudo -u "$NEWUSER" sudo bash "$SCRIPTS"/"$1".sh
+        sudo -u "$NEWUSER" sudo bash "$1"
     fi
 fi