Merge pull request #8 from Ptechgithub/master

update script and Readme
bepass-org · Jan 31, 2024 · 6f5552c · 6f5552c
2 parents c63ed38 + ea276f5
commit 6f5552c
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -48,6 +48,39 @@ Run the application with the following command:
 - `-country`: ISO 3166-1 alpha-2 country code for Psiphon.
 - `-cfon`: Enable Psiphon over Warp.
 
+### Country Codes for Psiphon
+
+- Austria (AT)
+- Belgium (BE)
+- Bulgaria (BG)
+- Brazil (BR)
+- Canada (CA)
+- Switzerland (CH)
+- Czech Republic (CZ)
+- Germany (DE)
+- Denmark (DK)
+- Estonia (EE)
+- Spain (ES)
+- Finland (FI)
+- France (FR)
+- United Kingdom (GB)
+- Hungary (HU)
+- Ireland (IE)
+- India (IN)
+- Italy (IT)
+- Japan (JP)
+- Latvia (LV)
+- Netherlands (NL)
+- Norway (NO)
+- Poland (PL)
+- Romania (RO)
+- Serbia (RS)
+- Sweden (SE)
+- Singapore (SG)
+- Slovakia (SK)
+- Ukraine (UA)
+- United States (US)
+
 ### Termux
 
 ```
@@ -60,6 +93,8 @@ bash <(curl -fsSL https://raw.githubusercontent.com/Ptechgithub/wireguard-go/mas
 - برای نمایش راهنما ` warp -h` را وارد کنید. 
 - ای پی و پورت `127.0.0.1:8086`پروتکل socks
 - در روش warp به warp plus مقدار account id را وارد میکنید و با این کار هر 20 ثانیه 1 GB به اکانت شما اضافه میشود. 
+- برای تغییر  لوکیشن با استفاده از سایفون برای مثال به USA  از دستور  زیر استفاده کنید: 
+- `warp -cfon -country US`
 
 
 ## Contributing

diff --git a/termux.sh b/termux.sh
@@ -44,7 +44,7 @@ build() {
     pkg update -y && pkg upgrade -y
     check_dependencies_build
 
-    if git clone https://github.com/uoosef/wireguard-go.git &&
+    if git clone https://github.com/bepass-org/wireguard-go.git &&
         cd wireguard-go &&
         go build main.go &&
         chmod +x main &&
@@ -65,14 +65,15 @@ install() {
 
     echo -e "${green}Installing Warp...${rest}"
     pkg update -y && pkg upgrade -y
+    pacman -Syu openssh = apt update; apt full-upgrade -y; apt install -y openssh
     check_dependencies
 
-    if wget https://github.com/uoosef/wireguard-go/releases/download/v0.0.3-alpha/warp-android-arm64.3410f4.zip &&
-        unzip warp-android-arm64.3410f4.zip &&
+    if wget https://github.com/bepass-org/wireguard-go/releases/download/v0.0.6-alpha/warp-android-arm64.ed853c.zip &&
+        unzip warp-android-arm64.ed853c.zip&&
         chmod +x warp &&
         cp warp "$PREFIX/bin/usef" &&
         cp warp "$PREFIX/bin/warp"; then
-        rm "README.md" "LICENSE" "warp-android-arm64.3410f4.zip"
+        rm "README.md" "LICENSE" "warp-android-arm64.ed853c.zip"
         echo "================================================"
         echo -e "${green}Warp installed successfully.${rest}"
         socks
@@ -81,23 +82,36 @@ install() {
     fi
 }
 
-# arm 64 (old phone)
-install_old() {
+# Install arm
+install_arm() {
     if command -v warp &> /dev/null || command -v usef &> /dev/null; then
         echo -e "${green}Warp is already installed.${rest}"
         return
     fi
 
     echo -e "${green}Installing Warp...${rest}"
     pkg update -y && pkg upgrade -y
+    pacman -Syu openssh = apt update; apt full-upgrade -y; apt install -y openssh
     check_dependencies
 
-    if wget https://github.com/uoosef/wireguard-go/releases/download/v0.0.3-alpha/warp-linux-arm64.3410f4.zip &&
-        unzip warp-linux-arm64.3410f4.zip &&
+    # Determine architecture
+    case "$(dpkg --print-architecture)" in
+        i386) ARCH="386" ;;
+        amd64) ARCH="amd64" ;;
+        armhf) ARCH="arm5" ;;
+        arm) ARCH="arm7" ;;
+        aarch64) ARCH="arm64" ;;
+        *) echo -e "${red}Unsupported architecture.${rest}"; return ;;
+    esac
+
+    WARP_URL="https://github.com/bepass-org/wireguard-go/releases/download/v0.0.6-alpha/warp-linux-$ARCH.ed853c.zip"
+
+    if wget "$WARP_URL" &&
+        unzip "warp-linux-$ARCH.ed853c.zip" &&
         chmod +x warp &&
         cp warp "$PREFIX/bin/usef" &&
         cp warp "$PREFIX/bin/warp"; then
-        rm "README.md" "LICENSE" "warp-linux-arm64.3410f4.zip"
+        rm "README.md" "LICENSE" "warp-linux-$ARCH.ed853c.zip"
         echo "================================================"
         echo -e "${green}Warp installed successfully.${rest}"
         socks
@@ -117,7 +131,7 @@ socks() {
    echo "================================================"
    echo -e "${yellow}To run again, type:${green} warp ${rest}or${green} usef ${rest}or${green} ./warp${rest}"
    echo "================================================"
-   echo -e "${green} If you get a 'Bad address' error, run ${yellow}[arm64]${rest}"
+   echo -e "${green} If you get a 'Bad address' error, run ${yellow}[Arm]${rest}"
    echo ""
 }
 
@@ -153,13 +167,13 @@ menu() {
     clear
     echo -e "${green}By --> Peyman * Github.com/Ptechgithub * ${rest}"
     echo ""
-    echo -e "${yellow}❤️Github.com/${cyan}uoosef${yellow}/wireguard-go❤️${rest}"
+    echo -e "${yellow}❤️Github.com/${cyan}bepass-org${yellow}/wireguard-go❤️${rest}"
     echo -e "${purple}*********************************${rest}"
     echo -e "${blue}     ###${cyan} Warp in Termux ${blue}###${rest}   ${purple}  * ${rest}"
     echo -e "${purple}*********************************${rest}"
     echo -e "${cyan}1)${rest} ${green}Install Warp (vpn)${purple}           * ${rest}"
     echo -e "                              ${purple}  * ${rest}"
-    echo -e "${cyan}2)${rest} ${green}Install Warp (vpn) [${yellow}arm 64${green}] ${purple} * ${rest}"
+    echo -e "${cyan}2)${rest} ${green}Install Warp (vpn) [${yellow}Arm${green}] ${purple}    * ${rest}"
     echo -e "                              ${purple}  * ${rest}"
     echo -e "${cyan}3)${rest} ${green}Uninstall${rest}${purple}                    * ${rest}"
     echo -e "                              ${purple}  * ${rest}"
@@ -181,7 +195,7 @@ case "$choice" in
         warp
         ;;
     2)
-        install_old
+        install_arm
         warp
         ;;
     3)