Pier Angelo Vendrame pushed to branch tor-browser-140.0a1-15.0-2 at The Tor Project / Applications / Tor Browser

Commits:

1 changed file:

Changes:

  • mobile/android/fenix/tools/tba-fetch-deps.sh
    ... ... @@ -91,8 +91,7 @@ else
    91 91
     	rm "$app_services"
    
    92 92
     fi
    
    93 93
     mkdir -p "$GRADLE_MAVEN_REPOSITORIES/org/mozilla"
    
    94
    -if [ -f "$app_services" ]; then
    
    95
    -	tar -C /tmp -xf "$app_services"
    
    94
    +if [ -d /tmp/application-services ]; then
    
    96 95
     	cp -r /tmp/application-services/maven/org/mozilla/* "$GRADLE_MAVEN_REPOSITORIES/org/mozilla"
    
    97 96
     
    
    98 97
     	# Over on tor-browser-build all build tools are built for x86_64-linux.
    
    ... ... @@ -103,7 +102,7 @@ if [ -f "$app_services" ]; then
    103 102
     	# support reproducibility and are not necessary for development builds.
    
    104 103
     	if [ "$os" != "unknown-linux" ] || [ "$arch" != "x86_64" ]; then
    
    105 104
     		echo "Downloading nimbus-fml binary for $arch-$os"
    
    106
    -		app_services_version=$(echo "$app_services" | grep -oE 'application-services-[0-9]+\.[0-9]+\.[0-9]+' | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
    
    105
    +		app_services_version=$(echo "$app_services" | grep -oE 'application-services-[0-9]+\.[0-9]+(\.[0-9]{1,2})?' | grep -oE '[0-9]+\.[0-9]+(\.[0-9]{1,2})?')
    
    107 106
     
    
    108 107
     		curl -L -o /tmp/nimbus-fml.zip "https://archive.mozilla.org/pub/app-services/releases/$app_services_version/nimbus-fml.zip"
    
    109 108
     		unzip -d /tmp/nimbus-fml /tmp/nimbus-fml.zip