From 361c1338783f1090e28c6444e75957e8e75da6ef Mon Sep 17 00:00:00 2001 From: Marwolf Date: Wed, 22 Aug 2018 11:06:34 -0400 Subject: [PATCH 01/12] Dividing to prevent loop --- Linux_Cloner.sh | 19 +++++++++++++++++++ Linux_Installer.sh | 8 +------- 2 files changed, 20 insertions(+), 7 deletions(-) create mode 100755 Linux_Cloner.sh diff --git a/Linux_Cloner.sh b/Linux_Cloner.sh new file mode 100755 index 0000000..2af1086 --- /dev/null +++ b/Linux_Cloner.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash +# shellcheck disable=SC1090 + +# Open RSC: A replica RSC private server framework +# +# Installs and updates Open RSC +# +# Install with this command (from your Linux machine): +# +# curl -sSL https://raw.githubusercontent.com/Open-RSC/Docker-Home/master/Linux_Cloner.sh | bash + +# -e option instructs bash to immediately exit if any command [1] has a non-zero exit status +# We do not want users to end up with a partially working install, so we exit the script +# instead of continuing the installation with something broken + +cd / +sudo git clone https://github.com/Open-RSC/Docker-Home.git &>/dev/null +cd Docker-Home +./Linux_Installer diff --git a/Linux_Installer.sh b/Linux_Installer.sh index 380ccee..7206f3b 100755 --- a/Linux_Installer.sh +++ b/Linux_Installer.sh @@ -7,18 +7,12 @@ # # Install with this command (from your Linux machine): # -# curl -sSL https://raw.githubusercontent.com/Open-RSC/Docker-Home/master/Linux_Installer.sh | bash +# curl -sSL https://raw.githubusercontent.com/Open-RSC/Docker-Home/master/Linux_Cloner.sh | bash # -e option instructs bash to immediately exit if any command [1] has a non-zero exit status # We do not want users to end up with a partially working install, so we exit the script # instead of continuing the installation with something broken -cd / -sudo git clone https://github.com/Open-RSC/Docker-Home.git &>/dev/null -cd Docker-Home - - -clear choice="" RED=`tput setaf 1` GREEN=`tput setaf 2` From a0b4ae997e448a4736582fc49c36ba1c26d74463 Mon Sep 17 00:00:00 2001 From: Marwolf Date: Wed, 22 Aug 2018 11:08:33 -0400 Subject: [PATCH 02/12] Still having a loop issue --- Linux_Cloner.sh | 7 ++----- Linux_Installer.sh | 7 +------ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Linux_Cloner.sh b/Linux_Cloner.sh index 2af1086..8dd9db4 100755 --- a/Linux_Cloner.sh +++ b/Linux_Cloner.sh @@ -1,5 +1,4 @@ -#!/usr/bin/env bash -# shellcheck disable=SC1090 +#!/bin/bash # Open RSC: A replica RSC private server framework # @@ -9,9 +8,7 @@ # # curl -sSL https://raw.githubusercontent.com/Open-RSC/Docker-Home/master/Linux_Cloner.sh | bash -# -e option instructs bash to immediately exit if any command [1] has a non-zero exit status -# We do not want users to end up with a partially working install, so we exit the script -# instead of continuing the installation with something broken +choice="" cd / sudo git clone https://github.com/Open-RSC/Docker-Home.git &>/dev/null diff --git a/Linux_Installer.sh b/Linux_Installer.sh index 7206f3b..5a12523 100755 --- a/Linux_Installer.sh +++ b/Linux_Installer.sh @@ -1,5 +1,4 @@ -#!/usr/bin/env bash -# shellcheck disable=SC1090 +#!/bin/bash # Open RSC: A replica RSC private server framework # @@ -9,10 +8,6 @@ # # curl -sSL https://raw.githubusercontent.com/Open-RSC/Docker-Home/master/Linux_Cloner.sh | bash -# -e option instructs bash to immediately exit if any command [1] has a non-zero exit status -# We do not want users to end up with a partially working install, so we exit the script -# instead of continuing the installation with something broken - choice="" RED=`tput setaf 1` GREEN=`tput setaf 2` From e7a40ee00699127d1fff5b9307a3eea02365d1b4 Mon Sep 17 00:00:00 2001 From: Marwolf Date: Wed, 22 Aug 2018 11:09:24 -0400 Subject: [PATCH 03/12] Fix --- Linux_Cloner.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Linux_Cloner.sh b/Linux_Cloner.sh index 8dd9db4..4c98f83 100755 --- a/Linux_Cloner.sh +++ b/Linux_Cloner.sh @@ -8,8 +8,6 @@ # # curl -sSL https://raw.githubusercontent.com/Open-RSC/Docker-Home/master/Linux_Cloner.sh | bash -choice="" - cd / sudo git clone https://github.com/Open-RSC/Docker-Home.git &>/dev/null cd Docker-Home From dc1a061f76165a4f09f82d5dc587668dc8290de2 Mon Sep 17 00:00:00 2001 From: Marwolf Date: Wed, 22 Aug 2018 11:09:58 -0400 Subject: [PATCH 04/12] Readme installer filename change --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7acd7f7..fe9c57c 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Install with this command (from your Linux machine): - curl -sSL https://raw.githubusercontent.com/Open-RSC/Docker-Home/master/Linux_Installer.sh | bash + curl -sSL https://raw.githubusercontent.com/Open-RSC/Docker-Home/master/Linux_Cloner.sh | bash [Return to top](#top) ___ From a7612326ff996f4b70a5652bb681108fe61e4e91 Mon Sep 17 00:00:00 2001 From: Marwolf Date: Wed, 22 Aug 2018 11:11:12 -0400 Subject: [PATCH 05/12] Attempting --- Linux_Cloner.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Linux_Cloner.sh b/Linux_Cloner.sh index 4c98f83..d1bf3d7 100755 --- a/Linux_Cloner.sh +++ b/Linux_Cloner.sh @@ -10,5 +10,4 @@ cd / sudo git clone https://github.com/Open-RSC/Docker-Home.git &>/dev/null -cd Docker-Home -./Linux_Installer +`pwd`/Docker-Home/Linux_Installer.sh From 1ed5e4c420d278021e173ac46100f2b4ce61ab59 Mon Sep 17 00:00:00 2001 From: Marwolf Date: Wed, 22 Aug 2018 11:12:14 -0400 Subject: [PATCH 06/12] Test --- Linux_Cloner.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Linux_Cloner.sh b/Linux_Cloner.sh index d1bf3d7..5320f1f 100755 --- a/Linux_Cloner.sh +++ b/Linux_Cloner.sh @@ -10,4 +10,5 @@ cd / sudo git clone https://github.com/Open-RSC/Docker-Home.git &>/dev/null -`pwd`/Docker-Home/Linux_Installer.sh +cd /Docker-Home +./Linux_Installer.sh From aba30ce2974a4736d42889dcf1d30a943689714e Mon Sep 17 00:00:00 2001 From: Marwolf Date: Wed, 22 Aug 2018 11:14:16 -0400 Subject: [PATCH 07/12] Test --- Linux_Cloner.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Linux_Cloner.sh b/Linux_Cloner.sh index 5320f1f..aab96f4 100755 --- a/Linux_Cloner.sh +++ b/Linux_Cloner.sh @@ -11,4 +11,4 @@ cd / sudo git clone https://github.com/Open-RSC/Docker-Home.git &>/dev/null cd /Docker-Home -./Linux_Installer.sh +`pwd`/Linux_Installer.sh From bf13ac5e7597b6f4720a92cc60c4e51b91b76a86 Mon Sep 17 00:00:00 2001 From: Marwolf Date: Wed, 22 Aug 2018 11:15:54 -0400 Subject: [PATCH 08/12] Test --- Linux_Cloner.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Linux_Cloner.sh b/Linux_Cloner.sh index aab96f4..f193916 100755 --- a/Linux_Cloner.sh +++ b/Linux_Cloner.sh @@ -11,4 +11,4 @@ cd / sudo git clone https://github.com/Open-RSC/Docker-Home.git &>/dev/null cd /Docker-Home -`pwd`/Linux_Installer.sh +"./Linux_Installer.sh" From 29df528d3ce3d9f4b37f9488d60c3ee472539947 Mon Sep 17 00:00:00 2001 From: Marwolf Date: Wed, 22 Aug 2018 11:17:05 -0400 Subject: [PATCH 09/12] Test --- Linux_Cloner.sh | 1 + Linux_Installer.sh | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Linux_Cloner.sh b/Linux_Cloner.sh index f193916..f6922da 100755 --- a/Linux_Cloner.sh +++ b/Linux_Cloner.sh @@ -8,6 +8,7 @@ # # curl -sSL https://raw.githubusercontent.com/Open-RSC/Docker-Home/master/Linux_Cloner.sh | bash +choice="" cd / sudo git clone https://github.com/Open-RSC/Docker-Home.git &>/dev/null cd /Docker-Home diff --git a/Linux_Installer.sh b/Linux_Installer.sh index 5a12523..82d4dd7 100755 --- a/Linux_Installer.sh +++ b/Linux_Installer.sh @@ -128,10 +128,6 @@ if [ "$install" == "1" ]; then # Install Choice <=================================================== -clear -echo "Checking for updates to the Docker-Home repository." -sudo git pull &>/dev/null - clear echo "${RED}Open RSC Installer:${NC} An easy to run RSC private server using Docker magic. From 67ba00e230e732784e6197aaab90813fe9b1899f Mon Sep 17 00:00:00 2001 From: Marwolf Date: Wed, 22 Aug 2018 11:18:03 -0400 Subject: [PATCH 10/12] Hodor --- Linux_Cloner.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Linux_Cloner.sh b/Linux_Cloner.sh index f6922da..61a0c6a 100755 --- a/Linux_Cloner.sh +++ b/Linux_Cloner.sh @@ -10,6 +10,6 @@ choice="" cd / -sudo git clone https://github.com/Open-RSC/Docker-Home.git &>/dev/null +sudo git clone https://github.com/Marwolf/Docker-Home.git &>/dev/null cd /Docker-Home "./Linux_Installer.sh" From 0067a0206ff7de861bf829a8ad4f542b144d6e9f Mon Sep 17 00:00:00 2001 From: Marwolf Date: Wed, 22 Aug 2018 11:20:17 -0400 Subject: [PATCH 11/12] Test --- Linux_Cloner.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Linux_Cloner.sh b/Linux_Cloner.sh index 61a0c6a..77d1088 100755 --- a/Linux_Cloner.sh +++ b/Linux_Cloner.sh @@ -1,5 +1,3 @@ -#!/bin/bash - # Open RSC: A replica RSC private server framework # # Installs and updates Open RSC @@ -8,8 +6,7 @@ # # curl -sSL https://raw.githubusercontent.com/Open-RSC/Docker-Home/master/Linux_Cloner.sh | bash -choice="" cd / -sudo git clone https://github.com/Marwolf/Docker-Home.git &>/dev/null +sudo git clone https://github.com/Marwolf/Docker-Home.git cd /Docker-Home "./Linux_Installer.sh" From c19e05b3af082f37b2dd1bc45f534593e2c87fdf Mon Sep 17 00:00:00 2001 From: Marwolf Date: Wed, 22 Aug 2018 11:27:02 -0400 Subject: [PATCH 12/12] Sets correct stdin --- Linux_Installer.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Linux_Installer.sh b/Linux_Installer.sh index 82d4dd7..ec6452a 100755 --- a/Linux_Installer.sh +++ b/Linux_Installer.sh @@ -1,4 +1,5 @@ #!/bin/bash +exec 0/dev/null + clear echo "${RED}Open RSC Installer:${NC} An easy to run RSC private server using Docker magic.