From fec98d8027a2497a50dddd093fb65c6d1a12ee76 Mon Sep 17 00:00:00 2001 From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:20:23 +0330 Subject: [PATCH 1/9] Test Dev --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 09ca9fb..cbea79b 100644 --- a/install.sh +++ b/install.sh @@ -13,7 +13,7 @@ if ! command -v jq &> /dev/null || ! command -v git &> /dev/null || ! command -v apt update && apt upgrade -y && apt install jq qrencode curl pwgen uuid-runtime python3 python3-pip python3-venv git bc -y fi -git clone https://github.com/ReturnFI/Hysteria2 /etc/hysteria +git clone -b Dev https://github.com/ReturnFI/Hysteria2 /etc/hysteria # Create and activate Python virtual environment cd /etc/hysteria From b931c177e3350279ad128c8cae159ba06a342436 Mon Sep 17 00:00:00 2001 From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:21:57 +0330 Subject: [PATCH 2/9] Fix virtual environment --- core/scripts/telegrambot/runbot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/scripts/telegrambot/runbot.sh b/core/scripts/telegrambot/runbot.sh index 9fb1a2e..0002d31 100644 --- a/core/scripts/telegrambot/runbot.sh +++ b/core/scripts/telegrambot/runbot.sh @@ -19,7 +19,7 @@ Description=Hysteria Telegram Bot After=network.target [Service] -ExecStart=/etc/hysteria/hysteria2_venv/bin/python /etc/hysteria/core/scripts/telegrambot/tbot.py +ExecStart=ExecStart=/bin/bash -c 'source /etc/hysteria/hysteria2_venv/bin/activate && /etc/hysteria/hysteria2_venv/bin/python /etc/hysteria/core/scripts/telegrambot/tbot.py' WorkingDirectory=/etc/hysteria/core/scripts/telegrambot Restart=always User=root From be423809682e2f1716a635c0b7b322798c30843e Mon Sep 17 00:00:00 2001 From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:24:16 +0330 Subject: [PATCH 3/9] Fix virtual environment --- core/scripts/singbox/singbox_shell.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/scripts/singbox/singbox_shell.sh b/core/scripts/singbox/singbox_shell.sh index b7a6550..51c89ed 100644 --- a/core/scripts/singbox/singbox_shell.sh +++ b/core/scripts/singbox/singbox_shell.sh @@ -32,7 +32,7 @@ Description=Singbox Python Service After=network.target [Service] -ExecStart=/etc/hysteria/hysteria2_venv/bin/python /etc/hysteria/core/scripts/singbox/singbox.py +ExecStart=/bin/bash -c 'source /etc/hysteria/hysteria2_venv/bin/activate && /etc/hysteria/hysteria2_venv/bin/python /etc/hysteria/core/scripts/singbox/singbox.py' WorkingDirectory=/etc/hysteria/core/scripts/singbox EnvironmentFile=/etc/hysteria/core/scripts/singbox/.env Restart=always From c19c116b32b1beae756ecaf44243ab9c1a76a114 Mon Sep 17 00:00:00 2001 From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:39:57 +0330 Subject: [PATCH 4/9] Test Dev --- upgrade.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upgrade.sh b/upgrade.sh index f82d90f..4f85aa3 100644 --- a/upgrade.sh +++ b/upgrade.sh @@ -22,7 +22,7 @@ echo "Removing /etc/hysteria directory" rm -rf /etc/hysteria/ echo "Cloning Hysteria2 repository" -git clone https://github.com/ReturnFI/Hysteria2 /etc/hysteria +git clone -b Dev https://github.com/ReturnFI/Hysteria2 /etc/hysteria echo "Downloading geosite.dat and geoip.dat" wget -O /etc/hysteria/geosite.dat https://raw.githubusercontent.com/Chocolate4U/Iran-v2ray-rules/release/geosite.dat >/dev/null 2>&1 From 05655c486732e3247ddda6d9325b75737f9143df Mon Sep 17 00:00:00 2001 From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:48:05 +0330 Subject: [PATCH 5/9] Fix Bug --- core/scripts/telegrambot/runbot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/scripts/telegrambot/runbot.sh b/core/scripts/telegrambot/runbot.sh index 0002d31..344b12e 100644 --- a/core/scripts/telegrambot/runbot.sh +++ b/core/scripts/telegrambot/runbot.sh @@ -19,7 +19,7 @@ Description=Hysteria Telegram Bot After=network.target [Service] -ExecStart=ExecStart=/bin/bash -c 'source /etc/hysteria/hysteria2_venv/bin/activate && /etc/hysteria/hysteria2_venv/bin/python /etc/hysteria/core/scripts/telegrambot/tbot.py' +ExecStart=/bin/bash -c 'source /etc/hysteria/hysteria2_venv/bin/activate && /etc/hysteria/hysteria2_venv/bin/python /etc/hysteria/core/scripts/telegrambot/tbot.py' WorkingDirectory=/etc/hysteria/core/scripts/telegrambot Restart=always User=root From a07fb8fb5ae1c0f2f46f4cf9104b808f3ee61ca1 Mon Sep 17 00:00:00 2001 From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com> Date: Wed, 14 Aug 2024 13:12:56 +0330 Subject: [PATCH 6/9] Update alias for Debian --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index cbea79b..1e84468 100644 --- a/install.sh +++ b/install.sh @@ -22,8 +22,8 @@ source /etc/hysteria/hysteria2_venv/bin/activate pip install -r requirements.txt # Add alias 'hys2' for Hysteria2 -if ! grep -q "alias hys2='/etc/hysteria/menu.sh'" ~/.bashrc; then - echo "alias hys2='/etc/hysteria/menu.sh'" >> ~/.bashrc +if ! grep -q "alias hys2='source /etc/hysteria/hysteria2_venv/bin/activate && /etc/hysteria/menu.sh'" ~/.bashrc; then + echo "alias hys2='source /etc/hysteria/hysteria2_venv/bin/activate && /etc/hysteria/menu.sh'" >> ~/.bashrc source ~/.bashrc fi From 41196a2f70337a9051426e1bb9be8843163f02ec Mon Sep 17 00:00:00 2001 From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com> Date: Wed, 14 Aug 2024 20:58:25 +0330 Subject: [PATCH 7/9] Clone Main --- upgrade.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upgrade.sh b/upgrade.sh index 4f85aa3..f82d90f 100644 --- a/upgrade.sh +++ b/upgrade.sh @@ -22,7 +22,7 @@ echo "Removing /etc/hysteria directory" rm -rf /etc/hysteria/ echo "Cloning Hysteria2 repository" -git clone -b Dev https://github.com/ReturnFI/Hysteria2 /etc/hysteria +git clone https://github.com/ReturnFI/Hysteria2 /etc/hysteria echo "Downloading geosite.dat and geoip.dat" wget -O /etc/hysteria/geosite.dat https://raw.githubusercontent.com/Chocolate4U/Iran-v2ray-rules/release/geosite.dat >/dev/null 2>&1 From aa1cf9ea3e0edc876f55b182e0b30edcc23ace8d Mon Sep 17 00:00:00 2001 From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com> Date: Wed, 14 Aug 2024 20:58:38 +0330 Subject: [PATCH 8/9] Clone Main --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 1e84468..c08d75a 100644 --- a/install.sh +++ b/install.sh @@ -13,7 +13,7 @@ if ! command -v jq &> /dev/null || ! command -v git &> /dev/null || ! command -v apt update && apt upgrade -y && apt install jq qrencode curl pwgen uuid-runtime python3 python3-pip python3-venv git bc -y fi -git clone -b Dev https://github.com/ReturnFI/Hysteria2 /etc/hysteria +git clone https://github.com/ReturnFI/Hysteria2 /etc/hysteria # Create and activate Python virtual environment cd /etc/hysteria From 14794bf74256b30b2f775aa5c7a1278485650f26 Mon Sep 17 00:00:00 2001 From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com> Date: Wed, 14 Aug 2024 20:59:07 +0330 Subject: [PATCH 9/9] Update VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c946ee6..1180819 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.6 +0.1.7