From 15992166859df3eb9156e3cea5d31d998f82e342 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Thu, 24 Sep 2020 13:01:29 +0200
Subject: [PATCH] Fixed output of new repo scipt

---
 CoreModules/apache/preconf.sh       | 2 +-
 CoreModules/generic/preconf.sh      | 8 ++++----
 CoreModules/nginx/preconf.sh        | 2 +-
 CoreModules/nginx_nonphp/preconf.sh | 2 +-
 Scripts/SMI.sh                      | 2 +-
 SubModules/redis/preconf.sh         | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CoreModules/apache/preconf.sh b/CoreModules/apache/preconf.sh
index 356770b..a4bbb1b 100644
--- a/CoreModules/apache/preconf.sh
+++ b/CoreModules/apache/preconf.sh
@@ -1 +1 @@
-curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=apache osrel=$shortdist bash
\ No newline at end of file
+curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=apache osrel=$shortdist bash > $OUTPUT 2>&1 > $OUTPUT 2>&1
\ No newline at end of file
diff --git a/CoreModules/generic/preconf.sh b/CoreModules/generic/preconf.sh
index a248710..f7d9e74 100644
--- a/CoreModules/generic/preconf.sh
+++ b/CoreModules/generic/preconf.sh
@@ -2,15 +2,15 @@
 #  Prerequisite packages  #
 ##-----------------------##
 
-curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=init osrel=$shortdist bash
+curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=init osrel=$shortdist bash > $OUTPUT 2>&1
 
 ##--------------##
 #  Repositories  #
 ##--------------##
 
-curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=universe osrel=$shortdist bash
-curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=php osrel=$shortdist bash
-curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=certbot osrel=$shortdist bash
+curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=universe osrel=$shortdist bash > $OUTPUT 2>&1
+curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=php osrel=$shortdist bash > $OUTPUT 2>&1
+curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=certbot osrel=$shortdist bash > $OUTPUT 2>&1
 
 
 ##-------------##
diff --git a/CoreModules/nginx/preconf.sh b/CoreModules/nginx/preconf.sh
index 7a12768..2e50473 100644
--- a/CoreModules/nginx/preconf.sh
+++ b/CoreModules/nginx/preconf.sh
@@ -1 +1 @@
-curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=nginx osrel=$shortdist bash
\ No newline at end of file
+curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=nginx osrel=$shortdist bash > $OUTPUT 2>&1
\ No newline at end of file
diff --git a/CoreModules/nginx_nonphp/preconf.sh b/CoreModules/nginx_nonphp/preconf.sh
index 79d5d8f..c0b8fdf 100644
--- a/CoreModules/nginx_nonphp/preconf.sh
+++ b/CoreModules/nginx_nonphp/preconf.sh
@@ -1,4 +1,4 @@
-curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=nginx osrel=$shortdist bash
+curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=nginx osrel=$shortdist bash > $OUTPUT 2>&1
 
 #Disable PhpMyadmin and Backend cms
 disbackendcms=1
diff --git a/Scripts/SMI.sh b/Scripts/SMI.sh
index 238e8d2..ac49623 100644
--- a/Scripts/SMI.sh
+++ b/Scripts/SMI.sh
@@ -84,7 +84,7 @@ fi
 ##--------------------## 
 
 msg "                Preconfiguring"
-curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=init osrel=$shortdist bash
+curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=init osrel=$shortdist bash > $OUTPUT 2>&1
 $PKGM update
 $PKGM upgrade -y
 
diff --git a/SubModules/redis/preconf.sh b/SubModules/redis/preconf.sh
index 9c0f2f1..85dceb4 100644
--- a/SubModules/redis/preconf.sh
+++ b/SubModules/redis/preconf.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=redis osrel=$shortdist bash
\ No newline at end of file
+curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=redis osrel=$shortdist bash > $OUTPUT 2>&1
\ No newline at end of file