GRIN/nym
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update bundle id and package

Browse Source
This commit is contained in:
Zane Schepke
2023-11-24 12:47:21 -05:00
parent 874aecb0a4
commit 099d23b568
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nym-vpn/desktop/nymvpn-packages/macos/build.sh
+2 -2
View File
@@ -29,11 +29,11 @@ fi
pkgbuild \
--install-location /Applications \
--identifier net.nymvpn.macos \
--identifier net.nymtech.vpn \
--version "${VERSION}" \
--scripts "./pkg/scripts" \
--root "./pkg/root/Applications" \
./packages/net.nymvpn.macos.pkg
./packages/net.nymtech.vpn.pkg
productbuild \
--distribution "./pkg/Distribution" \
nym-vpn/desktop/nymvpn-packages/macos/pkg/Distribution
+7 -7
View File
@@ -4,12 +4,12 @@
<welcome file="welcome.html" mime-type="text/html"/>
<conclusion file="conclusion.html" mime-type="text/html"/>
<options customize="never" require-scripts="false" />
<pkg-ref id="net.nymvpn.macos">
<pkg-ref id="net.nymtech.vpn">
<bundle-version>
<bundle CFBundleShortVersionString="APP_VERSION" CFBundleVersion="APP_VERSION" id="net.nymvpn.macos" path="nymvpn.net"/>
<bundle CFBundleShortVersionString="APP_VERSION" CFBundleVersion="APP_VERSION" id="net.nymtech.vpn" path="nymvpn.net"/>
</bundle-version>
</pkg-ref>
<product id="net.nymvpn.macos" version="APP_VERSION"/>
<product id="net.nymtech.vpn" version="APP_VERSION"/>
<volume-check>
<allowed-os-versions>
<os-version min="10.11.0"/>
@@ -17,13 +17,13 @@
</volume-check>
<choices-outline>
<line choice="default">
<line choice="net.nymvpn.macos"/>
<line choice="net.nymtech.vpn"/>
</line>
</choices-outline>
<choice id="default" title="nymvpn" versStr="APP_VERSION"/>
<choice id="net.nymvpn.macos" title="nymvpn" visible="false">
<pkg-ref id="net.nymvpn.macos"/>
<choice id="net.nymtech.vpn" title="nymvpn" visible="false">
<pkg-ref id="net.nymtech.vpn"/>
</choice>
<pkg-ref id="net.nymvpn.macos" version="APP_VERSION" onConclusion="none" >#net.nymvpn.macos.pkg</pkg-ref>
<pkg-ref id="net.nymtech.vpn" version="APP_VERSION" onConclusion="none" >#net.nymtech.vpn.pkg</pkg-ref>
<domains enable_anywhere="false" enable_currentUserHome="false" enable_localSystem="true"/>
</installer-gui-script>
nym-vpn/desktop/nymvpn-packages/macos/pkg/root/Applications/upvpn.app/Contents/Info.plist
+1 -1
View File
@@ -13,7 +13,7 @@
<key>CFBundleIconFile</key>
<string>icon.icns</string>
<key>CFBundleIdentifier</key>
<string>net.nymvpn.macos</string>
<string>net.nymtech.vpn</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
nym-vpn/desktop/nymvpn-packages/macos/pkg/root/Applications/upvpn.app/Contents/Resources/uninstall.sh
+2 -2
View File
@@ -3,7 +3,7 @@
set -ueo pipefail
LOG_DIR="/var/log/nymvpn"
NYMVPN_DAEMON_PLIST_PATH="/Library/LaunchDaemons/net.nymvpn.daemon.plist"
NYMVPN_DAEMON_PLIST_PATH="/Library/LaunchDaemons/net.nymtech.daemon.plist"
ask_confirmation() {
read -p "Are you sure you want to stop and uninstall nymvpn? (y/n) "
@@ -29,7 +29,7 @@ uninstall() {
echo "Removing files ..."
sudo rm /usr/local/bin/nymvpn || true
sudo rm -rf /Applications/nymvpn.net || true
sudo pkgutil --forget net.nymvpn.macos || true
sudo pkgutil --forget net.nymtech.vpn || true
sudo rm -rf /var/log/nymvpn || true
sudo rm -rf /etc/nymvpn || true
}
nym-vpn/desktop/nymvpn-packages/macos/pkg/scripts/postinstall
+2 -2
View File
@@ -7,7 +7,7 @@ set -euo pipefail
INSTALL_DIR="/Applications"
LOG_DIR="/var/log/nymvpn"
NYMVPN_DAEMON_PLIST_PATH="/Library/LaunchDaemons/net.nymvpn.daemon.plist"
NYMVPN_DAEMON_PLIST_PATH="/Library/LaunchDaemons/net.nymtech.daemon.plist"
mkdir -p $LOG_DIR
chmod 755 $LOG_DIR
@@ -20,7 +20,7 @@ NYMVPN_DAEMON_PLIST=$(cat <<-PLIST
<plist version="1.0">
<dict>
<key>Label</key>
<string>net.nymvpn.daemon</string>
<string>net.nymtech.daemon</string>
<key>ProgramArguments</key>
<array>
<string>${INSTALL_DIR}/nymvpn.net/Contents/Resources/nymvpn-daemon</string>
nym-vpn/desktop/nymvpn-packages/macos/pkg/scripts/preinstall
+1 -1
View File
@@ -7,7 +7,7 @@ set -euo pipefail
INSTALL_DIR="/Applications"
LOG_DIR="/var/log/nymvpn"
NYMVPN_DAEMON_PLIST_PATH="/Library/LaunchDaemons/net.nymvpn.daemon.plist"
NYMVPN_DAEMON_PLIST_PATH="/Library/LaunchDaemons/net.nymtech.daemon.plist"
mkdir -p $LOG_DIR
chmod 755 $LOG_DIR
nym-vpn/desktop/nymvpn-ui/src-tauri/tauri.conf.json
+1 -1
View File
@@ -49,7 +49,7 @@
"../../nymvpn-assets/icons/icon.icns",
"../../nymvpn-assets/icons/icon.ico"
],
"identifier": "net.nymvpn.client",
"identifier": "net.nymtech.client",
"longDescription": "",
"macOS": {
"entitlements": null,