From c4693c4b145939489ecc605609f587422c437c9b Mon Sep 17 00:00:00 2001 From: partisan Date: Sat, 18 Jan 2025 11:48:30 +0100 Subject: [PATCH] changed to mozilla-release --- .gitignore | 2 ++ main.go | 10 +++++----- spitfire/checks.go | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index f99bd16..a1bf5d6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ /mozilla-central +/mozilla-release +/.vscode /patches /packages.json /packages_temp.json diff --git a/main.go b/main.go index 304593b..fed7d4e 100644 --- a/main.go +++ b/main.go @@ -32,8 +32,8 @@ var ( platform string upload bool uploadPath string - sourceRepo = "https://hg.mozilla.org/mozilla-central" - patchesRepo = "https://weforge.xyz/Spitfire/Browser.git" + sourceRepo = "https://hg.mozilla.org/releases/mozilla-release" + patchesRepo = "https://weforge.xyz/Spitfire/Patcher.git" url = "https://spitfirebrowser.xyz/" licence = "AGPL-3.0" name = "Spitfire" @@ -69,7 +69,7 @@ func init() { func printHelp() { fmt.Println("Usage: go run . -p= -t= [-c|--compress] [-v|--version=] [-component=] [-arch=] [-release=] [-platform=]") flag.PrintDefaults() - fmt.Println("Example: go run . --upload -c --upload-path=./mozilla-central/obj-x86_64-pc-linux-gnu/dist/bin -a") + fmt.Println("Example: go run . --upload -c --upload-path=./mozilla-release/obj-x86_64-pc-linux-gnu/dist/bin -a") os.Exit(0) } @@ -116,7 +116,7 @@ func main() { if compress || upload { // Resolve the build directory dynamically fmt.Println("Resolving build directory dynamically...") - sourcePath, err := spitfire.ResolvePath("./mozilla-central") + sourcePath, err := spitfire.ResolvePath("./mozilla-release") if err != nil { log.Fatalf("Error resolving source path: %v", err) } @@ -146,7 +146,7 @@ func main() { // Update the BuildProcess function to pass patchesRepo func BuildProcess() { - sourcePath, err := spitfire.ResolvePath("./mozilla-central") + sourcePath, err := spitfire.ResolvePath("./mozilla-release") if err != nil { log.Fatalf("Error resolving source path: %v", err) } diff --git a/spitfire/checks.go b/spitfire/checks.go index 8a78440..75cb9a5 100644 --- a/spitfire/checks.go +++ b/spitfire/checks.go @@ -41,9 +41,9 @@ func CheckDependencies() error { } // Special check for `mach` in the local source directory - machPath := filepath.Join("mozilla-central", "mach") + machPath := filepath.Join("mozilla-release", "mach") if !fileExists(machPath) { - missingTools = append(missingTools, "mach (ensure you are in the mozilla-central directory)") + missingTools = append(missingTools, "mach (ensure you are in the mozilla-release directory)") } // Report missing tools if any