From 91b23071facc476ccc1bc0bcbdf4144e1d46fd4b 2023-02-02 22:32:25
From: RhodeCode Admin <admin@rhodecode.com>
Date: 2023-02-02 22:32:25
Subject: [PATCH] rcstack: use dl server


---

diff --git a/README.md b/README.md
index 019de49..81884c9 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ Metrics
 
 ```
 mkdir docker-rhodecode && cd docker-rhodecode
-curl -s -o rcstack https://code.rhodecode.com/rhodecode-enterprise-docker/raw/master/scripts/rcstack/rcstack && chmod +x rcstack
+curl -L -s -o rcstack https://dls.rhodecode.com/get/master && chmod +x rcstack
 ./rcstack get-started
 ```
 
diff --git a/scripts/rcstack/rcstack b/scripts/rcstack/rcstack
index 8837034..198dab2 100755
--- a/scripts/rcstack/rcstack
+++ b/scripts/rcstack/rcstack
@@ -270,7 +270,7 @@ rcstack_self_update_usage() {
 
     # :command.usage_examples
     printf "%s\n" "Examples:"
-    printf "  - ./rccstack self-update simply to update it to a new version\n  - ./rccstack self-update --installer-revision=dev --revision=dev to fetch dev\n  branch and install it\n  # In case rcstack breaks, you can always just fetch the stack script using\n  curl\n  curl -s -o rcstack\n  https://code.rhodecode.com/rhodecode-enterprise-docker/raw/master/scripts/rcstack/rcstack\n  && chmod +x rcstack\n"
+    printf "  - ./rccstack self-update simply to update it to a new version\n  \n  # to fetch dev branch and install it\n  - ./rccstack self-update --installer-revision=dev --revision=dev\n  \n  # In case rcstack breaks, you can re-download the stack script using curl\n  curl -L -s -o rcstack https://dls.rhodecode.com/get/master && chmod +x rcstack\n"
     echo
 
   fi
@@ -1642,7 +1642,7 @@ get_docker_definitions() {
   echo "$(green bootstrap_definitions: docker definitions extracted to $SOURCE_DIR)"
 
   # cleanup
-  find -nowarn -ignore_readdir_race $SOURCE_DIR -name "*.~*~" -delete
+  find -nowarn -ignore_readdir_race "$SOURCE_DIR" -name "*.~*~" -delete
 }
 
 # src/lib/reconfigure_ini.sh
@@ -2070,12 +2070,18 @@ rcstack_self_update_command() {
     echo "running: curl --no-progress-meter --fail --header \"X-Rc-Auth-Token: $AUTH_TOKEN\" -o $DL_TARGET -L $FETCH_FROM"
   fi
 
-  curl --no-progress-meter --fail --header "X-Rc-Auth-Token: $AUTH_TOKEN" -o $DL_TARGET -L $FETCH_FROM
+  curl -L --no-progress-meter --fail --header "X-Rc-Auth-Token: $AUTH_TOKEN" -o $DL_TARGET $FETCH_FROM
 
   chmod +x $DL_TARGET
 
-  version_old=$($FINAL_TARGET --version)
-  rc_version_old=$($FINAL_TARGET cli image-info)
+  version_old=0
+  rc_version_old=0
+
+  # check if we have OLD file, in case we don't just set versions to 0
+  if [[ -f "$FINAL_TARGET" ]]; then
+    version_old=$($FINAL_TARGET --version)
+    rc_version_old=$($FINAL_TARGET cli image-info)
+  fi
 
   version_dl=$($DL_TARGET --version)
   rc_version_dl=$($DL_TARGET cli image-info)
@@ -2119,7 +2125,12 @@ rcstack_self_update_command() {
   fi
 
   echo "$(green self-update: updating $RC_SCRIPT_NAME script to new version: $version_dl)"
-  rm $FINAL_TARGET && mv -v $DL_TARGET $FINAL_TARGET
+
+  if [[ -f "$FINAL_TARGET" ]]; then
+    rm $FINAL_TARGET && mv -v $DL_TARGET $FINAL_TARGET
+  else
+    mv -v $DL_TARGET $FINAL_TARGET
+  fi
 
   get_docker_definitions $revision $DEBUG