Publish v1.1.216

vpnhood · Feb 18, 2021 · 8e13391 · 8e13391
1 parent 5a312df
commit 8e13391
Show file tree

Hide file tree

Showing 8 changed files with 144 additions and 142 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,11 @@
-# v1.1.214
+# v1.1.216
 * New: Updater has completely changed
 
 ### Server
 * New: Add stop command to stop all server instance
 * New: linux: Add installation script
-* New: linux: Run server as service
+* New: linux: Run server as a service
+* change: rename "run" command to "start"
 
 # v1.1.202
 ### Client
@@ -122,3 +123,4 @@
 
 
 
+
diff --git a/Pub/Common.ps1 b/Pub/Common.ps1
@@ -15,7 +15,7 @@ $versionFile = Join-Path $PSScriptRoot "version.json"
 $versionJson = (Get-Content $versionFile | Out-String | ConvertFrom-Json);
 $bumpTime = [datetime]::Parse($versionJson.BumpTime);
 $autoBump=((Get-Date)-$bumpTime).TotalMinutes -ge 30;
-if ( $autoBump -or $bump )
+if ( $bump )
 {
 	$isVersionBumped = $true;
 	$versionJson.Build = $versionJson.Build + 1;

diff --git a/Pub/PublishToGitHub.ps1 b/Pub/PublishToGitHub.ps1
@@ -3,7 +3,7 @@
 # server install-linux.sh
 echo "Make Server installation script for this release"
 $linuxScript = (Get-Content -Path "$solutionDir/VpnHood.Server.App.Net/Install/install-linux.sh" -Raw).Replace('$installUrlParam', "https://github.com/vpnhood/VpnHood/releases/download/$versionTag/VpnHoodServer.zip");
-$linuxScript  | Out-File -FilePath "$packagesServerDir/install-linux.sh" -Encoding utf8 -Force;
+$linuxScript  | Out-File -FilePath "$packagesServerDir/install-linux.sh" -Encoding ASCII -Force -NoNewline ;
 
 # update CHANGELOG
 $text = Get-Content "$solutionDir/CHANGELOG.md" -Raw;

diff --git a/Pub/Version.json b/Pub/Version.json
diff --git a/VpnHood.Client.App.Android/Properties/AndroidManifest.xml b/VpnHood.Client.App.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="213" android:versionName="Beta" package="com.vpnhood.client.android" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="216" android:versionName="Beta" package="com.vpnhood.client.android" android:installLocation="auto">
   <uses-sdk android:minSdkVersion="22" android:targetSdkVersion="30" />
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

diff --git a/VpnHood.Client.App.Win.Setup/VpnHood.Client.App.Win.Setup.aip b/VpnHood.Client.App.Win.Setup/VpnHood.Client.App.Win.Setup.aip
diff --git a/VpnHood.Server.App.Net/Install/install-linux.sh b/VpnHood.Server.App.Net/Install/install-linux.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 echo "Installation script for linux";
 read -p "Install .NET Runtime 5.0 for ubuntu/20.10 (y/n)?" install_net;
-read -p "Autorun (y/n)?" autorun;
+read -p "Auto Start (y/n)?" autostart;
 
-# Varialbles
-installUrl="https://github.com/vpnhood/VpnHood/releases/download/v1.1.213-beta/VpnHoodServer.zip";
+# Variables
+installUrl="$installUrlParam";
 destinationPath="/opt/VpnHoodServer";
 
 # point to latest version if $installUrl is not et
@@ -36,7 +36,7 @@ mkdir -p $destinationPath;
 unzip -o VpnHoodServer.zip -d $destinationPath;
 rm VpnHoodServer.zip
 
-if [ "$autorun" = "y" ]; then
+if [ "$autostart" = "y" ]; then
 	echo "creating autostart service. Name: VpnHoodService...";
 	service="
 	[Unit]

diff --git a/VpnHood.Server.App.Net/Program.cs b/VpnHood.Server.App.Net/Program.cs
@@ -71,7 +71,7 @@ static void Main(string[] args)
                 if (args[i] == "/?") args[i] = "-?";
 
             // set default
-            if (args.Length == 0) args = new string[] { "run" };
+            if (args.Length == 0) args = new string[] { "start" };
             var cmdApp = new CommandLineApplication()
             {
                 AllowArgumentSeparator = true,
@@ -83,7 +83,7 @@ static void Main(string[] args)
             cmdApp.HelpOption(true);
             cmdApp.VersionOption("-n|--version", AssemblyName.Version.ToString());
 
-            cmdApp.Command("run", RunServer);
+            cmdApp.Command("start", StartServer);
             cmdApp.Command("stop", StopServer);
 
             // show file access server options
@@ -280,7 +280,7 @@ private static void PrintToken(Guid tokenId)
             Console.WriteLine(JsonSerializer.Serialize(access, new JsonSerializerOptions() { WriteIndented = true }));
         }
 
-        private static void RunServer(CommandLineApplication cmdApp)
+        private static void StartServer(CommandLineApplication cmdApp)
         {
             cmdApp.Description = "Run the server (default command)";
             var portOption = cmdApp.Option("-p|--port", "listening port. default is 443 (https)", CommandOptionType.SingleValue);