From 7744b2a1ce8325bfc56a9d3fd86466b2bae94ab3 Mon Sep 17 00:00:00 2001
From: KMY <tt@kmycode.net>
Date: Sun, 17 Sep 2023 20:13:01 +0900
Subject: [PATCH] Update and move scripts

---
 install/{ => 5.0}/setup1.sh |  9 ++++++++-
 install/{ => 5.0}/setup2.sh | 10 ++--------
 install/{ => 5.0}/setup3.sh |  0
 install/{ => 5.0}/setup4.sh |  0
 4 files changed, 10 insertions(+), 9 deletions(-)
 rename install/{ => 5.0}/setup1.sh (82%)
 rename install/{ => 5.0}/setup2.sh (68%)
 rename install/{ => 5.0}/setup3.sh (100%)
 rename install/{ => 5.0}/setup4.sh (100%)

diff --git a/install/setup1.sh b/install/5.0/setup1.sh
similarity index 82%
rename from install/setup1.sh
rename to install/5.0/setup1.sh
index 91acd3cdb8..9fbc779b4d 100644
--- a/install/setup1.sh
+++ b/install/5.0/setup1.sh
@@ -1,3 +1,5 @@
+VERSION=5.0
+
 apt update && apt upgrade -y
 
 apt install -y curl wget gnupg apt-transport-https lsb-release ca-certificates
@@ -33,10 +35,15 @@ sudo -u postgres psql << EOF
 EOF
 
 # kmyblueソースコードをダウンロード
+# 続きのシェルスクリプトをgit管理外にコピーし権限を与える
 su - mastodon <<EOF
 git clone https://github.com/kmycode/mastodon.git live
-cp /home/mastodon/live/install/setup2.sh /home/mastodon/setup2.sh
+cp /home/mastodon/live/install/$VERSION/setup2.sh /home/mastodon/setup2.sh
+cp /home/mastodon/live/install/$VERSION/setup3.sh /home/mastodon/setup3.sh
+cp /home/mastodon/live/install/$VERSION/setup4.sh /home/mastodon/setup4.sh
 chmod +x /home/mastodon/setup2.sh
+chmod +x /home/mastodon/setup3.sh
+chmod +x /home/mastodon/setup4.sh
 EOF
 
 # ---------------------------------------------------
diff --git a/install/setup2.sh b/install/5.0/setup2.sh
similarity index 68%
rename from install/setup2.sh
rename to install/5.0/setup2.sh
index 0fc85d189a..a592efdaa5 100644
--- a/install/setup2.sh
+++ b/install/5.0/setup2.sh
@@ -1,11 +1,11 @@
-# gitで最新リリースを取得
 cd ~/live
 
-# 最新タグを取り込む
+# kmyblueの最新タグを取り込む
 if [ "$1" == "debug" ]; then
 elif [ "$1" == "newest" ]; then
   git checkout $(git tag -l | grep -E '^kb[0-9]' | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)
 else
+  # LTS
   git checkout $(git tag -l | grep -E '^kb[0-9].*lts$' | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)
 fi
 
@@ -15,12 +15,6 @@ cd ~/.rbenv && src/configure && make -C src
 echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc
 echo 'eval "$(rbenv init -)"' >> ~/.bashrc
 
-# 続きのシェルスクリプトをgit管理外にコピーし権限を与える
-cp /home/mastodon/live/install/setup3.sh /home/mastodon/setup3.sh
-chmod +x /home/mastodon/setup3.sh
-cp /home/mastodon/live/install/setup4.sh /home/mastodon/setup4.sh
-chmod +x /home/mastodon/setup4.sh
-
 # ---------------------------------------------------
 
 cat << EOF
diff --git a/install/setup3.sh b/install/5.0/setup3.sh
similarity index 100%
rename from install/setup3.sh
rename to install/5.0/setup3.sh
diff --git a/install/setup4.sh b/install/5.0/setup4.sh
similarity index 100%
rename from install/setup4.sh
rename to install/5.0/setup4.sh