From acfa5b80606f348ba7c1c15f3b85316e14073d96 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Fri, 27 Aug 2021 14:57:50 +0900
Subject: [PATCH] :v:

---
 ubuntu.sh                             | 13 ++++++--
 update.systemd.sh => update.ubuntu.sh | 48 +++++++++++++++++++++++++--
 2 files changed, 56 insertions(+), 5 deletions(-)
 rename update.systemd.sh => update.ubuntu.sh (60%)

diff --git a/ubuntu.sh b/ubuntu.sh
index f7953cd..bccf45f 100644
--- a/ubuntu.sh
+++ b/ubuntu.sh
@@ -363,8 +363,8 @@ tput setaf 7;
 apt update -y;
 apt install -y curl nano gnupg2 apt-transport-https ca-certificates lsb-release git build-essential software-properties-common ffmpeg uidmap$($nginx_local && echo " certbot")$($cloudflare && echo " python3-certbot-dns-cloudflare");
 
-#region work with misskey user
 if [ $method != "docker_hub" ]; then
+#region work with misskey user
 su "$misskey_user" << MKEOF
 set -eu;
 cd ~;
@@ -380,9 +380,9 @@ if [ -e "./$misskey_directory" ]; then
 fi
 git clone -b "$branch" --depth 1 --recursive "$repository" "$misskey_directory";
 MKEOF
-
+#endregion
 else
-
+#region work with misskey user
 su "$misskey_user" << MKEOF
 set -eu;
 cd ~;
@@ -401,8 +401,13 @@ else
 	mkdir "./$misskey_directory/.config"
 fi
 MKEOF
+#endregion
 fi
 
+tput setaf 3;
+echo "Process: write default.yml;";
+tput setaf 7;
+#region work with misskey user
 su "$misskey_user" << MKEOF
 set -eu;
 cd ~;
@@ -611,6 +616,7 @@ tput setaf 7;
 
 systemctl restart nginx;
 systemctl enable nginx;
+
 tput setaf 2;
 echo "Check: localhost returns nginx;";
 tput setaf 7;
@@ -828,6 +834,7 @@ echo "Process: create .misskey-docker.env;"
 tput setaf 7;
 
 cat > ".misskey-docker.env" << _EOF
+method="$method"
 host="$host"
 misskey_port=$misskey_port
 misskey_directory="$misskey_directory"
diff --git a/update.systemd.sh b/update.ubuntu.sh
similarity index 60%
rename from update.systemd.sh
rename to update.ubuntu.sh
index 09a1997..6036dc5 100644
--- a/update.systemd.sh
+++ b/update.ubuntu.sh
@@ -18,8 +18,46 @@
 # DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
-misskey_user=misskey
-misskey_directory=misskey
+
+tput setaf 2;
+echo "Check: root user;";
+if [ "$(whoami)" != 'root' ]; then
+	tput setaf 1;
+	echo "	NG. This script must be run as root.";
+	exit 1;
+else
+	tput setaf 7;
+	echo "	OK. I am root user.";
+fi
+
+tput setaf 3;
+echo "Process: import environment and detect method;";
+tput setaf 7;
+if [ -f "/root/.misskey.env" ]; then
+	. "/root/.misskey.env";
+	if [ -f "/home/$misskey_user/.misskey.env" ]; then
+		. "/home/$misskey_user/.misskey.env";
+		method=systemd;
+	elif [ -f "/home/$misskey_user/.misskey-docker.env" ]; then
+		. "/home/$misskey_user/.misskey-docker.env";
+	else
+		misskey_user=misskey;
+		misskey_directory=misskey;
+		misskey_localhost=localhost;
+		method=systemd;
+		echo "use default"
+	fi
+else
+	misskey_user=misskey;
+	misskey_directory=misskey;
+	misskey_localhost=localhost;
+	method=systemd;
+	echo "use default"
+fi
+
+echo "method: $method / user: $misskey_user / dir: $misskey_directory /  $misskey_localhost:$misskey_port"
+
+if [ $method == "systemd" ]; then
 
 #region work with misskey user
 su $misskey_user << MKEOF
@@ -49,3 +87,9 @@ if [ $1 == "-r" ]; then
 else
 	systemctl start misskey;
 fi
+
+elif [ $method == "docker" ]; then
+echo "todo"
+else
+echo "todo"
+fi
-- 
GitLab