feat: update the project root path logic(The process is in the same s…

…hell as the starting shell)
WGrape · Mar 4, 2024 · a560048 · a560048
1 parent e985dda
commit a560048
Show file tree

Hide file tree

Showing 106 changed files with 194 additions and 215 deletions.
diff --git a/.work/extra/service_example/hooks/after_start.sh b/.work/extra/service_example/hooks/after_start.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 # include sdk of sparrow.
-source .work/include/sdk.sh
+. .work/include/sdk.sh
diff --git a/.work/extra/service_example/hooks/after_stop.sh b/.work/extra/service_example/hooks/after_stop.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 # include sdk of sparrow.
-source .work/include/sdk.sh
+. .work/include/sdk.sh
diff --git a/.work/extra/service_example/hooks/before_start.sh b/.work/extra/service_example/hooks/before_start.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 # include sdk of sparrow.
-source .work/include/sdk.sh
+. .work/include/sdk.sh
diff --git a/.work/extra/service_example/hooks/before_stop.sh b/.work/extra/service_example/hooks/before_stop.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 # include sdk of sparrow.
-source .work/include/sdk.sh
+. .work/include/sdk.sh
diff --git a/.work/extra/service_example/make_app_image/run.sh b/.work/extra/service_example/make_app_image/run.sh
@@ -1,17 +1,16 @@
 #!/bin/sh
 
 # cd base dir of project.
-CUR_PATH=$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)
-cd $CUR_PATH && cd ../../
-BATH_PATH=$(pwd)
+# the process is in the same shell as the starting shell.
+cd $SPARROW_BASE_PATH
 
 # define this service.
 service_name="{{SERVICE}}"
 
 print_stage "try to pull/build sparrow-basic-${service_name} $IMAGE_BASIC_{{SERVICE_UPPER}}_VERSION"
 if pull basic $service_name $IMAGE_BASIC_{{SERVICE_UPPER}}_VERSION; then
     print_info "pull success"
-elif source "./${service_name}/make_basic_image/run.sh"; then
+elif . "./${service_name}/make_basic_image/run.sh"; then
     print_info "build success"
 else
     print_error "pull/build failed"

diff --git a/.work/extra/service_example/make_basic_image/run.sh b/.work/extra/service_example/make_basic_image/run.sh
@@ -1,9 +1,8 @@
 #!/bin/sh
 
 # cd base dir of project.
-CUR_PATH=$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)
-cd $CUR_PATH && cd ../../
-BATH_PATH=$(pwd)
+# the process is in the same shell as the starting shell.
+cd $SPARROW_BASE_PATH
 
 # define this service.
 service_name="{{SERVICE}}"

diff --git a/.work/include/internal/constant.sh b/.work/include/internal/constant.sh
@@ -1,9 +1,8 @@
 #!/bin/sh
 
 # cd base dir of project.
-CUR_PATH=$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)
-cd $CUR_PATH && cd ../../../
-BATH_PATH=$(pwd)
+# the process is in the same shell as the starting shell.
+cd $SPARROW_BASE_PATH
 
 # only define variables, these variables may used defined environment variables in /env file.
 

diff --git a/.work/include/internal/dockerhub.sh b/.work/include/internal/dockerhub.sh
@@ -1,9 +1,8 @@
 #!/bin/sh
 
 # cd base dir of project.
-CUR_PATH=$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)
-cd $CUR_PATH && cd ../../../
-BATH_PATH=$(pwd)
+# the process is in the same shell as the starting shell.
+cd $SPARROW_BASE_PATH
 
 # login of $DOCKERHUB_DOMAIN.
 # to be safety, never allow login with account in the command, you must login manually in your local system firstly.

diff --git a/.work/include/internal/helper.sh b/.work/include/internal/helper.sh
@@ -1,9 +1,8 @@
 #!/bin/sh
 
 # cd base dir of project.
-CUR_PATH=$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)
-cd $CUR_PATH && cd ../../../
-BATH_PATH=$(pwd)
+# the process is in the same shell as the starting shell.
+cd $SPARROW_BASE_PATH
 
 # -----------------------define some basic helpers-----------------------
 
@@ -200,7 +199,7 @@ pull_or_build_app_image() {
     version=$(eval echo "$"$version_name)
     if pull app $service $version; then
         print_info "pull success: pull app $service $version"
-    elif source "./$service/make_app_image/run.sh"; then
+    elif . "./$service/make_app_image/run.sh"; then
         print_info "build success: run $service/make_app_image/run.sh"
     else
         print_error "pull and build sparrow-app-$service image error"

diff --git a/.work/include/sdk.sh b/.work/include/sdk.sh
@@ -1,15 +1,14 @@
 #!/bin/sh
 
 # cd base dir of project.
-CUR_PATH=$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)
-cd $CUR_PATH && cd ../../
-BATH_PATH=$(pwd)
+# the process is in the same shell as the starting shell.
+cd $SPARROW_BASE_PATH
 
 # only include defined variables and functions.
 # this is no side effects.
-source .work/include/internal/constant.sh
-source .work/include/internal/helper.sh
-source .work/include/internal/dockerhub.sh
+. .work/include/internal/constant.sh
+. .work/include/internal/helper.sh
+. .work/include/internal/dockerhub.sh
 
 # update /env file and export env variables.
 if ! upenv; then

diff --git a/.work/tests/run.sh b/.work/tests/run.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # include sdk of sparrow.
-source .work/include/sdk.sh
+. .work/include/sdk.sh
 
 testhttp() {
     if is_mac; then

diff --git a/_install.sh b/_install.sh
@@ -5,13 +5,16 @@
 # To maintain consistency and facilitate management, the filenames of these scripts all use the underscore (_) prefix.
 # _install.sh
 
+# define the base path of project.
+CUR_PATH=$(cd "$(dirname "$0")" && pwd)
+SPARROW_BASE_PATH=$CUR_PATH
+
 # cd base dir of project.
-CUR_PATH=$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)
-cd $CUR_PATH
-BATH_PATH=$(pwd)
+# the process is in the same shell as the starting shell.
+cd $SPARROW_BASE_PATH
 
 # include sdk of sparrow.
-source .work/include/sdk.sh
+. .work/include/sdk.sh
 
 # chmod files.
 chmod_files() {

diff --git a/_uninstall.sh b/_uninstall.sh
@@ -5,10 +5,13 @@
 # To maintain consistency and facilitate management, the filenames of these scripts all use the underscore (_) prefix.
 # _uninstall.sh
 
+# define the base path of project.
+CUR_PATH=$(cd "$(dirname "$0")" && pwd)
+SPARROW_BASE_PATH=$CUR_PATH
+
 # cd base dir of project.
-CUR_PATH=$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)
-cd $CUR_PATH
-BATH_PATH=$(pwd)
+# the process is in the same shell as the starting shell.
+cd $SPARROW_BASE_PATH
 
 # command interface.
 read -p "do you want to uninstall？(input y): " confirmation
@@ -22,7 +25,7 @@ fi
 # =================== choose sure ===================
 
 # include sdk of sparrow.
-source .work/include/sdk.sh
+. .work/include/sdk.sh
 
 # remove files.
 remove_files() {

diff --git a/_update.sh b/_update.sh
@@ -5,13 +5,16 @@
 # To maintain consistency and facilitate management, the filenames of these scripts all use the underscore (_) prefix.
 # _update.sh
 
+# define the base path of project.
+CUR_PATH=$(cd "$(dirname "$0")" && pwd)
+SPARROW_BASE_PATH=$CUR_PATH
+
 # cd base dir of project.
-CUR_PATH=$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)
-cd $CUR_PATH
-BATH_PATH=$(pwd)
+# the process is in the same shell as the starting shell.
+cd $SPARROW_BASE_PATH
 
 # include sdk of sparrow.
-source .work/include/sdk.sh
+. .work/include/sdk.sh
 
 # update project.
 update_project() {

diff --git a/etcd/hooks/after_start.sh b/etcd/hooks/after_start.sh
@@ -2,4 +2,4 @@
 
 # not need to include sdk of sparrow.
 # because the execution of hook scripts must be within the sparrow script, sdk.sh has already been imported at this point.
-# source .work/include/sdk.sh
+# . .work/include/sdk.sh
diff --git a/etcd/hooks/after_stop.sh b/etcd/hooks/after_stop.sh
@@ -2,4 +2,4 @@
 
 # not need to include sdk of sparrow.
 # because the execution of hook scripts must be within the sparrow script, sdk.sh has already been imported at this point.
-# source .work/include/sdk.sh
+# . .work/include/sdk.sh
diff --git a/etcd/hooks/before_start.sh b/etcd/hooks/before_start.sh
@@ -2,4 +2,4 @@
 
 # not need to include sdk of sparrow.
 # because the execution of hook scripts must be within the sparrow script, sdk.sh has already been imported at this point.
-# source .work/include/sdk.sh
+# . .work/include/sdk.sh
diff --git a/etcd/hooks/before_stop.sh b/etcd/hooks/before_stop.sh
@@ -2,4 +2,4 @@
 
 # not need to include sdk of sparrow.
 # because the execution of hook scripts must be within the sparrow script, sdk.sh has already been imported at this point.
-# source .work/include/sdk.sh
+# . .work/include/sdk.sh
diff --git a/etcd/make_app_image/run.sh b/etcd/make_app_image/run.sh
@@ -1,17 +1,16 @@
 #!/bin/sh
 
 # cd base dir of project.
-CUR_PATH=$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)
-cd $CUR_PATH && cd ../../
-BATH_PATH=$(pwd)
+# the process is in the same shell as the starting shell.
+cd $SPARROW_BASE_PATH
 
 # define this service.
 service_name="etcd"
 
 print_stage "try to pull/build sparrow-basic-${service_name} $IMAGE_BASIC_ETCD_VERSION"
 if pull basic $service_name $IMAGE_BASIC_ETCD_VERSION; then
     print_info "pull success"
-elif source "./${service_name}/make_basic_image/run.sh"; then
+elif . "./${service_name}/make_basic_image/run.sh"; then
     print_info "build success"
 else
     print_error "pull/build failed"

diff --git a/etcd/make_basic_image/run.sh b/etcd/make_basic_image/run.sh
@@ -1,9 +1,8 @@
 #!/bin/sh
 
 # cd base dir of project.
-CUR_PATH=$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)
-cd $CUR_PATH && cd ../../
-BATH_PATH=$(pwd)
+# the process is in the same shell as the starting shell.
+cd $SPARROW_BASE_PATH
 
 # define this service.
 service_name="etcd"

diff --git a/etcdkeeper/hooks/after_start.sh b/etcdkeeper/hooks/after_start.sh
@@ -2,4 +2,4 @@
 
 # not need to include sdk of sparrow.
 # because the execution of hook scripts must be within the sparrow script, sdk.sh has already been imported at this point.
-# source .work/include/sdk.sh
+# . .work/include/sdk.sh
diff --git a/etcdkeeper/hooks/after_stop.sh b/etcdkeeper/hooks/after_stop.sh
@@ -2,4 +2,4 @@
 
 # not need to include sdk of sparrow.
 # because the execution of hook scripts must be within the sparrow script, sdk.sh has already been imported at this point.
-# source .work/include/sdk.sh
+# . .work/include/sdk.sh
diff --git a/etcdkeeper/hooks/before_start.sh b/etcdkeeper/hooks/before_start.sh
@@ -2,4 +2,4 @@
 
 # not need to include sdk of sparrow.
 # because the execution of hook scripts must be within the sparrow script, sdk.sh has already been imported at this point.
-# source .work/include/sdk.sh
+# . .work/include/sdk.sh
diff --git a/etcdkeeper/hooks/before_stop.sh b/etcdkeeper/hooks/before_stop.sh
@@ -2,4 +2,4 @@
 
 # not need to include sdk of sparrow.
 # because the execution of hook scripts must be within the sparrow script, sdk.sh has already been imported at this point.
-# source .work/include/sdk.sh
+# . .work/include/sdk.sh
diff --git a/etcdkeeper/make_app_image/run.sh b/etcdkeeper/make_app_image/run.sh
@@ -1,17 +1,16 @@
 #!/bin/sh
 
 # cd base dir of project.
-CUR_PATH=$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)
-cd $CUR_PATH && cd ../../
-BATH_PATH=$(pwd)
+# the process is in the same shell as the starting shell.
+cd $SPARROW_BASE_PATH
 
 # define this service.
 service_name="etcdkeeper"
 
 print_stage "try to pull/build sparrow-basic-${service_name} $IMAGE_BASIC_ETCDKEEPER_VERSION"
 if pull basic $service_name $IMAGE_BASIC_ETCDKEEPER_VERSION; then
     print_info "pull success"
-elif source "./${service_name}/make_basic_image/run.sh"; then
+elif . "./${service_name}/make_basic_image/run.sh"; then
     print_info "build success"
 else
     print_error "pull/build failed"

diff --git a/etcdkeeper/make_basic_image/run.sh b/etcdkeeper/make_basic_image/run.sh
@@ -1,9 +1,8 @@
 #!/bin/sh
 
 # cd base dir of project.
-CUR_PATH=$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)
-cd $CUR_PATH && cd ../../
-BATH_PATH=$(pwd)
+# the process is in the same shell as the starting shell.
+cd $SPARROW_BASE_PATH
 
 # define this service.
 service_name="etcdkeeper"

diff --git a/go/hooks/after_start.sh b/go/hooks/after_start.sh
@@ -2,4 +2,4 @@
 
 # not need to include sdk of sparrow.
 # because the execution of hook scripts must be within the sparrow script, sdk.sh has already been imported at this point.
-# source .work/include/sdk.sh
+# . .work/include/sdk.sh
diff --git a/go/hooks/after_stop.sh b/go/hooks/after_stop.sh
@@ -2,4 +2,4 @@
 
 # not need to include sdk of sparrow.
 # because the execution of hook scripts must be within the sparrow script, sdk.sh has already been imported at this point.
-# source .work/include/sdk.sh
+# . .work/include/sdk.sh
diff --git a/go/hooks/before_start.sh b/go/hooks/before_start.sh
@@ -2,7 +2,7 @@
 
 # not need to include sdk of sparrow.
 # because the execution of hook scripts must be within the sparrow script, sdk.sh has already been imported at this point.
-# source .work/include/sdk.sh
+# . .work/include/sdk.sh
 
 if [ ! -d "$GO_PATH" ]; then
     if ! mkdir -p "$GO_PATH"; then

diff --git a/go/hooks/before_stop.sh b/go/hooks/before_stop.sh
@@ -2,4 +2,4 @@
 
 # not need to include sdk of sparrow.
 # because the execution of hook scripts must be within the sparrow script, sdk.sh has already been imported at this point.
-# source .work/include/sdk.sh
+# . .work/include/sdk.sh
diff --git a/go/make_app_image/run.sh b/go/make_app_image/run.sh
@@ -1,17 +1,16 @@
 #!/bin/sh
 
 # cd base dir of project.
-CUR_PATH=$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)
-cd $CUR_PATH && cd ../../
-BATH_PATH=$(pwd)
+# the process is in the same shell as the starting shell.
+cd $SPARROW_BASE_PATH
 
 # define this service.
 service_name="go"
 
 print_stage "try to pull/build sparrow-basic-${service_name} $IMAGE_BASIC_GO_VERSION"
 if pull basic $service_name $IMAGE_BASIC_GO_VERSION; then
     print_info "pull success"
-elif source "./${service_name}/make_basic_image/run.sh"; then
+elif . "./${service_name}/make_basic_image/run.sh"; then
     print_info "build success"
 else
     print_error "pull/build failed"

diff --git a/go/make_basic_image/run.sh b/go/make_basic_image/run.sh
@@ -1,9 +1,8 @@
 #!/bin/sh
 
 # cd base dir of project.
-CUR_PATH=$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)
-cd $CUR_PATH && cd ../../
-BATH_PATH=$(pwd)
+# the process is in the same shell as the starting shell.
+cd $SPARROW_BASE_PATH
 
 # define this service.
 service_name="go"

diff --git a/jupyter/hooks/after_start.sh b/jupyter/hooks/after_start.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 # include sdk of sparrow.
-source .work/include/sdk.sh
+. .work/include/sdk.sh
diff --git a/jupyter/hooks/after_stop.sh b/jupyter/hooks/after_stop.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 # include sdk of sparrow.
-source .work/include/sdk.sh
+. .work/include/sdk.sh
diff --git a/jupyter/hooks/before_start.sh b/jupyter/hooks/before_start.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 # include sdk of sparrow.
-source .work/include/sdk.sh
+. .work/include/sdk.sh
diff --git a/jupyter/hooks/before_stop.sh b/jupyter/hooks/before_stop.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 # include sdk of sparrow.
-source .work/include/sdk.sh
+. .work/include/sdk.sh