Merge pull request #160 from jumpserver/dev

v2.14.0 rc3
jumpserver · Sep 15, 2021 · e0feed4 · e0feed4
2 parents 3348dff + 256725c
commit e0feed4
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/quick_start.sh b/quick_start.sh
@@ -54,7 +54,13 @@ function get_installer() {
 
 function config_installer() {
   cd /opt/jumpserver-installer-${Version} || exit 1
-  sed -i "s/VERSION=.*/VERSION=${Version}/g" /opt/jumpserver-installer-${Version}/static.env
+  shopt -s expand_aliases
+  if [[ $(uname) == 'Darwin' ]]; then
+    alias sedi='sed -i ""'
+  else
+    alias sedi='sed -i'
+  fi
+  sedi "s/VERSION=.*/VERSION=${Version}/g" /opt/jumpserver-installer-${Version}/static.env
   ./jmsctl.sh install
   ./jmsctl.sh start
 }

diff --git a/scripts/0_prepare.sh b/scripts/0_prepare.sh
@@ -9,7 +9,7 @@ USE_XPACK="${USE_XPACK-0}"
 
 function prepare_config_xpack() {
   if [[ "${USE_XPACK}" == "1" ]]; then
-    sed -i 's@USE_XPACK=.*@USE_XPACK=1@g' "${PROJECT_DIR}"/config-example.txt
+    sedi 's@USE_XPACK=.*@USE_XPACK=1@g' "${PROJECT_DIR}"/config-example.txt
   fi
 }
 

diff --git a/scripts/7_upgrade.sh b/scripts/7_upgrade.sh
@@ -39,7 +39,7 @@ function upgrade_config() {
     set_config CURRENT_VERSION "${VERSION}"
   fi
   if grep -q "server nginx" "${CONFIG_DIR}/nginx/lb_http_server.conf"; then
-    sed -i "s/server nginx/server web/g" "${CONFIG_DIR}/nginx/lb_http_server.conf"
+    sedi "s/server nginx/server web/g" "${CONFIG_DIR}/nginx/lb_http_server.conf"
   fi
 }
 
@@ -153,7 +153,7 @@ function main() {
   fi
 
   if [[ "${to_version}" && "${to_version}" != "${VERSION}" ]]; then
-    sed -i "s@VERSION=.*@VERSION=${to_version}@g" "${PROJECT_DIR}/static.env"
+    sedi "s@VERSION=.*@VERSION=${to_version}@g" "${PROJECT_DIR}/static.env"
     export VERSION=${to_version}
   fi
   echo

diff --git a/scripts/utils.sh b/scripts/utils.sh
@@ -1,9 +1,17 @@
 #!/usr/bin/env bash
 #
+
 BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 
 . "${BASE_DIR}/const.sh"
 
+shopt -s expand_aliases
+if [[ $(uname) == 'Darwin' ]]; then
+  alias sedi='sed -i ""'
+else
+  alias sedi='sed -i'
+fi
+
 function is_confirm() {
   read -r confirmed
   if [[ "${confirmed}" == "y" || "${confirmed}" == "Y" || ${confirmed} == "" ]]; then
@@ -89,11 +97,7 @@ function set_config() {
     return
   fi
 
-  if [[ "${OS}" == 'Darwin' ]]; then
-    sed -i '' "s,^${key}=.*$,${key}=${value},g" "${CONFIG_FILE}"
-  else
-    sed -i "s,^${key}=.*$,${key}=${value},g" "${CONFIG_FILE}"
-  fi
+  sedi "s,^${key}=.*$,${key}=${value},g" "${CONFIG_FILE}"
 }
 
 function test_mysql_connect() {
@@ -428,7 +432,7 @@ function prepare_config() {
   echo_done
 
   if [[ "$(uname -m)" == "aarch64" ]]; then
-    sed -i "s/# ignore-warnings ARM64-COW-BUG/ignore-warnings ARM64-COW-BUG/g" "${CONFIG_DIR}/redis/redis.conf"
+    sedi "s/# ignore-warnings ARM64-COW-BUG/ignore-warnings ARM64-COW-BUG/g" "${CONFIG_DIR}/redis/redis.conf"
   fi
 
   backup_dir="${CONFIG_DIR}/backup"