Merge pull request #1689 from mrpalide/fix/add-apps-to-package-installer

add missed apps to package installer
skycoin · Dec 11, 2023 · b705fe5 · b705fe5
2 parents 34b4a3e + b29b996
commit b705fe5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/scripts/mac_installer/create_installer.sh b/scripts/mac_installer/create_installer.sh
@@ -74,6 +74,8 @@ function build_installer() {
   mv ./skywire-visor ${installer_package_dir}/Contents/MacOS/skywire-visor
   mv ./skywire-cli ${installer_package_dir}/Contents/MacOS/skywire-cli
   mv ./apps/vpn-client ${installer_package_dir}/Contents/MacOS/apps/vpn-client
+  mv ./apps/skysocks-client ${installer_package_dir}/Contents/MacOS/apps/skysocks-client
+  mv ./apps/skychat ${installer_package_dir}/Contents/MacOS/apps/skychat
   cp ./dmsghttp-config.json ${installer_package_dir}/Contents/MacOS/dmsghttp-config.json
 
   cat <<EOF >${installer_package_dir}/Contents/MacOS/Skywire

diff --git a/scripts/win_installer/Product.wxs b/scripts/win_installer/Product.wxs
@@ -11,7 +11,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
    <Product Id="*" UpgradeCode="cd7955bc-304e-470f-9c24-eb9f429a8085"
             Name="Skywire"
-            Version="1.0.0"
+            Version="1.3.14"
             Manufacturer="Skycoin"
             Language="1033">
 
@@ -42,6 +42,7 @@
                <Directory Id="APPS" Name="apps">
                   <Component Id="AppsFiles" Guid="d6263d6c-acea-49a0-bd9b-610f8a8bce82">
                      <File Id="VPN_CLIENT" Source=".\build\apps\vpn-client.exe"/>
+                     <File Id="SKYSOCKS_CLIENT" Source=".\build\apps\skysocks-client.exe"/>
                      <RemoveFolder Id="APPS" On="uninstall"/>
                   </Component>
                </Directory>

diff --git a/scripts/win_installer/script.ps1 b/scripts/win_installer/script.ps1
@@ -68,6 +68,7 @@ function BuildInstaller($arch)
     Move-Item ..\..\archive\skywire-visor.exe .\build\skywire-visor.exe
     Move-Item ..\..\archive\skywire-cli.exe .\build\skywire-cli.exe
     Move-Item ..\..\archive\apps\vpn-client.exe .\build\apps\vpn-client.exe
+    Move-Item ..\..\archive\apps\skysocks-client.exe .\build\apps\skysocks-client.exe
     Copy-Item ..\..\archive\dmsghttp-config.json .\build\dmsghttp-config.json
     Copy-Item skywire.bat .\build\skywire.bat
     New-Item new.update  > $null