Update macOS build script to enable runtime, build DMG instead of PKG; update Tor; update build instructions

install/build_osx.sh

@@ -20,9 +20,7 @@ cd $ROOT
 if [ "$1" = "--release" ]; then
   mkdir -p dist
   APP_PATH="$ROOT/dist/OnionShare.app"
-  PKG_PATH="$ROOT/dist/OnionShare.pkg"
-  IDENTITY_NAME_APPLICATION="Developer ID Application: Micah Lee"
-  IDENTITY_NAME_INSTALLER="Developer ID Installer: Micah Lee"
+  IDENTITY_NAME_APPLICATION="Developer ID Application: Micah Lee (N9B95FDWH4)"
   ENTITLEMENTS_CHILD_PATH="$ROOT/install/macos_sandbox/child.plist"
   ENTITLEMENTS_PARENT_PATH="$ROOT/install/macos_sandbox/parent.plist"
 
@@ -30,26 +28,30 @@ if [ "$1" = "--release" ]; then
   codesign \
     --deep \
     -s "$IDENTITY_NAME_APPLICATION" \
+    -o runtime \
     --force \
     --entitlements "$ENTITLEMENTS_CHILD_PATH" \
     --timestamp \
     "$APP_PATH"
   codesign \
     -s "$IDENTITY_NAME_APPLICATION" \
+    -o runtime \
     --force \
     --entitlements "$ENTITLEMENTS_PARENT_PATH" \
     --timestamp \
     "$APP_PATH"
 
-  echo "Creating an installer"
-  productbuild \
-    --sign "$IDENTITY_NAME_INSTALLER" \
-    --component "$APP_PATH" /Applications \
-    --timestamp \
-    "$PKG_PATH"
+  echo "Create the DMG"
+  if [ ! -f "/usr/local/bin/create-dmg" ]; then
+    echo "Error: create-dmg is not installed"
+    exit 0
+  fi
+  /usr/local/bin/create-dmg "$APP_PATH" --identity "$IDENTITY_NAME_APPLICATION"
+  mv *.dmg dist
 
   echo "Cleaning up"
   rm -rf "$APP_PATH"
 
-  echo "All done, your installer is in: $PKG_PATH"
+  echo "All done, your DMG is in:"
+  ls dist/*.dmg
 fi

install/get-tor-osx.py

@@ -36,10 +36,10 @@ import requests
 
 
 def main():
-    dmg_url = "https://archive.torproject.org/tor-package-archive/torbrowser/8.5.5/TorBrowser-8.5.5-osx64_en-US.dmg"
-    dmg_filename = "TorBrowser-8.5.5-osx64_en-US.dmg"
+    dmg_url = "https://archive.torproject.org/tor-package-archive/torbrowser/9.5.4/TorBrowser-9.5.4-osx64_en-US.dmg"
+    dmg_filename = "TorBrowser-9.5.4-osx64_en-US.dmg"
     expected_dmg_sha256 = (
-        "9c1b7840bd251a4c52f0c919991e57cafb9178c55e11fa49f83ffacce3c20511"
+        "5cc9ef95db8d99e762822c0bd596d7042fba2728e542732f337368c6b891b3ea"
     )
 
     # Build paths
@@ -107,8 +107,8 @@ def main():
         os.path.join(dist_path, "MacOS", "Tor", "tor.real"),
     )
     shutil.copyfile(
-        os.path.join(dmg_tor_path, "MacOS", "Tor", "libevent-2.1.6.dylib"),
-        os.path.join(dist_path, "MacOS", "Tor", "libevent-2.1.6.dylib"),
+        os.path.join(dmg_tor_path, "MacOS", "Tor", "libevent-2.1.7.dylib"),
+        os.path.join(dist_path, "MacOS", "Tor", "libevent-2.1.7.dylib"),
     )
     os.chmod(os.path.join(dist_path, "MacOS", "Tor", "tor.real"), 0o755)
     # obfs4proxy binary

install/get-tor-windows.py

@@ -34,10 +34,10 @@ import requests
 
 
 def main():
-    exe_url = "https://archive.torproject.org/tor-package-archive/torbrowser/8.5.5/torbrowser-install-8.5.5_en-US.exe"
-    exe_filename = "torbrowser-install-8.5.5_en-US.exe"
+    exe_url = "https://archive.torproject.org/tor-package-archive/torbrowser/9.5.4/torbrowser-install-9.5.4_en-US.exe"
+    exe_filename = "torbrowser-install-9.5.4_en-US.exe"
     expected_exe_sha256 = (
-        "a3aa7e626d1d2365dcecc6f17055f467f31c4ff9558a769e51d4b90640e48bb0"
+        "af4c7ee756a3abf7b1f338d0bf7415b36b17bff56e0e6c08244d68a0bda81a29"
     )
     # Build paths
     root_path = os.path.dirname(