From bacee7a202a7e0774ad1c40197973bf953773497 Mon Sep 17 00:00:00 2001
From: Je Xia <i@jex.me>
Date: Tue, 14 Jan 2025 18:19:45 +0800
Subject: [PATCH] Update deploy script (#1017)

---
 scripts/deploy-ci.sh | 15 ++++++++-------
 scripts/deploy.sh    | 19 ++++++++++++-------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/scripts/deploy-ci.sh b/scripts/deploy-ci.sh
index 935df9b63..e9ed91e3f 100755
--- a/scripts/deploy-ci.sh
+++ b/scripts/deploy-ci.sh
@@ -27,6 +27,14 @@ fi
 
 echo "--- installing server..."
 ssh esm.sh << EOF
+  cd /tmp
+  tar -xzf esmd.tar.gz
+  if [ "\$?" != "0" ]; then
+    exit 1
+  fi
+  chmod +x esmd
+  rm -f esmd.tar.gz
+
   git version
   if [ "\$?" == "127" ]; then
     apt-get update
@@ -84,13 +92,6 @@ ssh esm.sh << EOF
     nohup rm -rf /tmp/.esm &
   fi
 
-  cd /tmp
-  tar -xzf esmd.tar.gz
-  if [ "\$?" != "0" ]; then
-    exit 1
-  fi
-  rm -f esmd.tar.gz
-  chmod +x esmd
   mv -f esmd /usr/local/bin/esmd
 
   if [ "\$reload" == "yes" ]; then
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 2f76662ea..949880d69 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -67,6 +67,14 @@ fi
 
 echo "--- installing..."
 ssh -p $sshPort ${user}@${host} << EOF
+  cd /tmp
+  tar -xzf esmd.tar.gz
+  if [ "\$?" != "0" ]; then
+    exit 1
+  fi
+  chmod +x esmd
+  rm -f esmd.tar.gz
+
   git version
   if [ "\$?" == "127" ]; then
     apt-get update
@@ -84,6 +92,10 @@ ssh -p $sshPort ${user}@${host} << EOF
       echo "Failed to add user 'esm'"
       exit 1
     fi
+    ufw version
+    if [ "\$?" == "0" ]; then
+      ufw allow http
+    fi
     echo "[Unit]" >> \$servicefile
     echo "Description=esm.sh service" >> \$servicefile
     echo "After=network.target" >> \$servicefile
@@ -113,13 +125,6 @@ ssh -p $sshPort ${user}@${host} << EOF
     echo "Stopped esmd.service."
   fi
 
-  cd /tmp
-  tar -xzf esmd.tar.gz
-  if [ "\$?" != "0" ]; then
-    exit 1
-  fi
-  rm -f esmd.tar.gz
-  chmod +x esmd
   mv -f esmd /usr/local/bin/esmd
 
   if [ "$init" == "yes" ]; then