Bug 40067: Update nightly directory for macos

projects/firefox/build

@@ -100,7 +100,7 @@ fi
 
 [% IF c("var/nightly") && c("var/tor-browser") -%]
   # Set update url for nightly (#33402 / #40033)
-  sed -i 's|^URL=https://aus1\.torproject\.org/.*|URL=https://nightlies.tbb.torproject.org/nightly-updates/updates/nightly-[% c("var/osname") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL|' build/application.ini.in
+  sed -i 's|^URL=https://aus1\.torproject\.org/.*|URL=https://nightlies.tbb.torproject.org/nightly-updates/updates/nightly-[% c("var/nightly_updates_osname") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL|' build/application.ini.in
 [% END -%]
 
 add_translation () {

projects/firefox/config

@@ -16,6 +16,7 @@ var:
   browser_build: 1
   branding_directory: 'browser/branding/alpha'
   copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
+  nightly_updates_osname: '[% c("var/osname") %]'
   deps:
     - build-essential
     - unzip
@@ -113,6 +114,7 @@ targets:
   osx:
     var:
       martools_filename: 'mar-tools-mac-[% c("var/osx_arch") %].zip'
+      nightly_updates_osname: macos
       arch_deps:
         - python3
         - python3-distutils

tools/signing/nightly/config.yml

@@ -10,7 +10,7 @@ publish_dirs:
     - nightly-linux-i686
     - nightly-windows-x86_64
     - nightly-windows-i686
-    - nightly-osx-x86_64
+    - nightly-macos
 nss_db_dir: nssdb
 nss_certname: nightly-marsigner
 gpg_keyring: keyring/torbrowser-nightly.gpg