Don't redundantly chown the configuration file, and move the --config…

…-file option to st2 instead of the login subcommand
StackStorm · Jun 21, 2018 · 2c2cad3 · 2c2cad3
1 parent de8a668
commit 2c2cad3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/scripts/includes/common.sh b/scripts/includes/common.sh
@@ -181,8 +181,8 @@ configure_st2_cli_config() {
   CURRENT_USER_CLI_CONFIG_DIRECTORY="${HOME}/.st2"
   CURRENT_USER_CLI_CONFIG_PATH="${CURRENT_USER_CLI_CONFIG_DIRECTORY}/config"
 
-  sudo st2 login --config-file ${ROOT_USER_CLI_CONFIG_PATH} \
-                 --write-password \
+  sudo st2 --config-file ${ROOT_USER_CLI_CONFIG_PATH} \
+           login --write-password \
                  --username ${USERNAME} --password ${PASSWORD}
 
   # Write config for root user
@@ -191,8 +191,8 @@ configure_st2_cli_config() {
   fi
 
   # Write config for current user (in case current user != root)
-  st2 login --config-file ${CURRENT_USER_CLI_CONFIG_PATH} \
-            --write-password \
+  st2 --config-file ${CURRENT_USER_CLI_CONFIG_PATH} \
+      login --write-password \
             --username ${USERNAME} --password ${PASSWORD}
 
   # Fix the permissions

diff --git a/scripts/st2bootstrap-deb.sh b/scripts/st2bootstrap-deb.sh
@@ -298,8 +298,8 @@ configure_st2_cli_config() {
   CURRENT_USER_CLI_CONFIG_DIRECTORY="${HOME}/.st2"
   CURRENT_USER_CLI_CONFIG_PATH="${CURRENT_USER_CLI_CONFIG_DIRECTORY}/config"
 
-  sudo st2 login --config-file ${ROOT_USER_CLI_CONFIG_PATH} \
-                 --write-password \
+  sudo st2 --config-file ${ROOT_USER_CLI_CONFIG_PATH} \
+           login --write-password \
                  --username ${USERNAME} --password ${PASSWORD}
 
   # Write config for root user
@@ -308,8 +308,8 @@ configure_st2_cli_config() {
   fi
 
   # Write config for current user (in case current user != root)
-  st2 login --config-file ${CURRENT_USER_CLI_CONFIG_PATH} \
-            --write-password \
+  st2 --config-file ${CURRENT_USER_CLI_CONFIG_PATH} \
+      login --write-password \
             --username ${USERNAME} --password ${PASSWORD}
 
   # Fix the permissions

diff --git a/scripts/st2bootstrap-el6.sh b/scripts/st2bootstrap-el6.sh
@@ -293,8 +293,8 @@ configure_st2_cli_config() {
   CURRENT_USER_CLI_CONFIG_DIRECTORY="${HOME}/.st2"
   CURRENT_USER_CLI_CONFIG_PATH="${CURRENT_USER_CLI_CONFIG_DIRECTORY}/config"
 
-  sudo st2 login --config-file ${ROOT_USER_CLI_CONFIG_PATH} \
-                 --write-password \
+  sudo st2 --config-file ${ROOT_USER_CLI_CONFIG_PATH} \
+           login --write-password \
                  --username ${USERNAME} --password ${PASSWORD}
 
   # Write config for root user
@@ -303,8 +303,8 @@ configure_st2_cli_config() {
   fi
 
   # Write config for current user (in case current user != root)
-  st2 login --config-file ${CURRENT_USER_CLI_CONFIG_PATH} \
-            --write-password \
+  st2 --config-file ${CURRENT_USER_CLI_CONFIG_PATH} \
+      login --write-password \
             --username ${USERNAME} --password ${PASSWORD}
 
   # Fix the permissions

diff --git a/scripts/st2bootstrap-el7.sh b/scripts/st2bootstrap-el7.sh
@@ -293,8 +293,8 @@ configure_st2_cli_config() {
   CURRENT_USER_CLI_CONFIG_DIRECTORY="${HOME}/.st2"
   CURRENT_USER_CLI_CONFIG_PATH="${CURRENT_USER_CLI_CONFIG_DIRECTORY}/config"
 
-  sudo st2 login --config-file ${ROOT_USER_CLI_CONFIG_PATH} \
-                 --write-password \
+  sudo st2 --config-file ${ROOT_USER_CLI_CONFIG_PATH} \
+           login --write-password \
                  --username ${USERNAME} --password ${PASSWORD}
 
   # Write config for root user
@@ -303,8 +303,8 @@ configure_st2_cli_config() {
   fi
 
   # Write config for current user (in case current user != root)
-  st2 login --config-file ${CURRENT_USER_CLI_CONFIG_PATH} \
-            --write-password \
+  st2 --config-file ${CURRENT_USER_CLI_CONFIG_PATH} \
+      login --write-password \
             --username ${USERNAME} --password ${PASSWORD}
 
   # Fix the permissions