Fix deploy script (#1004)

esm-dev · Jan 13, 2025 · 35cc465 · 35cc465
1 parent 552eb0a
commit 35cc465
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -107,7 +107,7 @@ jobs:
           node-version: 20
 
       - name: Build CLI
-        run: go build -ldflags="-s -w -X 'github.com/esm-dev/esm.sh/server.VERSION=${github.ref_name}'" -o cli/tmp/bin/esm.sh${{ matrix.ext }} cli/cmd/main.go
+        run: go build -ldflags="-s -w -X 'github.com/esm-dev/esm.sh/server.VERSION=${{ github.ref_name }}'" -o cli/tmp/bin/esm.sh${{ matrix.ext }} cli/cmd/main.go
         env:
           GOOS: ${{ matrix.os }}
           GOARCH: ${{ matrix.arch }}

diff --git a/scripts/deploy-ci.sh b/scripts/deploy-ci.sh
@@ -29,8 +29,8 @@ echo "--- installing server..."
 ssh esm.sh << EOF
   git version
   if [ "\$?" == "127" ]; then
-    apt update
-    apt install -y git
+    apt-get update
+    apt-get install -y git
   fi
 
   ufw version
@@ -43,7 +43,7 @@ ssh esm.sh << EOF
   reload=no
   if [ ! -f \$servicefile ]; then
     addgroup esm
-    adduser --ingroup esm --no-create-home --disabled-login --disabled-password --gecos "" esm
+    adduser --ingroup esm --home /esm --disabled-login --disabled-password --gecos "" esm
     if [ "\$?" != "0" ]; then
       echo "Failed to add user 'esm'"
       exit 1
@@ -73,7 +73,7 @@ ssh esm.sh << EOF
 
   rm -f \$configfile
   if [ "$SERVER_CONFIG" != "" ]; then
-    echo "${SERVER_CONFIG}" >> \$configfile
+    echo '${SERVER_CONFIG}' >> \$configfile
   else
     echo "{}" >> \$configfile
   fi

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
@@ -67,21 +67,19 @@ fi
 
 echo "--- installing..."
 ssh -p $sshPort ${user}@${host} << EOF
-  gv=\$(git version)
-  if [ "\$?" != "0" ]; then
-    apt update
-    apt install -y git
+  git version
+  if [ "\$?" == "127" ]; then
+    apt-get update
+    apt-get install -y git
   fi
-  echo \$gv
 
   if [ "$init" == "yes" ]; then
-    configfile=/etc/esmd/config.json
     servicefile=/etc/systemd/system/esmd.service
     if [ -f \$servicefile ]; then
       rm -f servicefile
     fi
     addgroup esm
-    adduser --ingroup esm --no-create-home --disabled-login --disabled-password --gecos "" esm
+    adduser --ingroup esm --home=/esm --disabled-login --disabled-password --gecos "" esm
     if [ "\$?" != "0" ]; then
       echo "Failed to add user 'esm'"
       exit 1
@@ -93,9 +91,10 @@ ssh -p $sshPort ${user}@${host} << EOF
     echo "[Service]" >> \$servicefile
     echo "Type=simple" >> \$servicefile
     if [ "$config" != "" ]; then
+      configfile=/etc/esmd/config.json
       mkdir -p /etc/esmd
       rm -f \$configfile
-      echo "$config" >> \$configfile
+      echo '$config' >> \$configfile
       echo "ExecStart=/usr/local/bin/esmd --config=\$configfile" >> \$servicefile
     else
       echo "ExecStart=/usr/local/bin/esmd" >> \$servicefile