Merge remote-tracking branch 'origin/v2' into v2

Author: Gaz492

.github/workflows/go.yml

@@ -5,8 +5,8 @@ on:
     types: [created]
 
 jobs:
-  release-linux-amd64:
-    name: release linux/amd64
+  release:
+    name: Build and release
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -16,15 +16,14 @@ jobs:
         exclude:
           - goarch: "386"
             goos: darwin
-          - goarch: arm64
-            goos: windows
     steps:
       - uses: actions/checkout@v2
-      - uses: wangyoucao577/go-release-action@v1.22
+      - uses: wangyoucao577/go-release-action@v1.28
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           goversion: 1.17
           goos: ${{ matrix.goos }}
           goarch: ${{ matrix.goarch }}
           binary_name: "CFExporter"
-          pre_command: "sed -i 's/${VERSION}/${{github.ref_name}}/g' main.go"
+          pre_command: "export CGO_ENABLED=0 && sed -i 's/${VERSION}/${{github.ref_name}}/g' main.go"
+          ldflags: "-extldflags=-static"

.gitignore

@@ -6,3 +6,5 @@ out/
 test/
 
 *.exe
+
+.DS_Store

go.mod

@@ -1,6 +1,6 @@
 module CurseForgeExporter
 
-go 1.17
+go 1.18
 
 require (
 	github.com/aviddiviner/go-murmur v0.0.0-20150519214947-b9740d71e571

main.go

@@ -172,6 +172,7 @@ func genOverrides(missingFiles []int64, folder string) {
 	}
 
 	if len(missingFiles) > 0 {
+		pterm.Debug.Println("Adding missing files to overrides:", missingFiles)
 		if _, err := os.Stat(path.Join(tmpDir, "overrides", folder)); os.IsNotExist(err) {
 			err := os.Mkdir(path.Join(tmpDir, "overrides", folder), os.ModePerm)
 			if err != nil {
@@ -205,7 +206,7 @@ func genOverrides(missingFiles []int64, folder string) {
 func extraIncludes() {
 	includeProgress, _ := pterm.DefaultProgressbar.WithTotal(len(buildConfig.Includes)).WithTitle("Adding extra includes to overrides").Start()
 	for _, include := range buildConfig.Includes {
-		if include != "mods" || include != "resourcepacks" {
+		if include != "mods" && include != "resourcepacks" {
 			includeProgress.UpdateTitle("Adding: " + include + " to overrides")
 			fToInclude := path.Join(*instanceDir, include)
 			fi, err := os.Stat(fToInclude)
@@ -227,6 +228,8 @@ func extraIncludes() {
 					pterm.Error.Println("Failed to copy file:", err)
 				}
 			}
+		} else {
+			pterm.Debug.Println("Skipping", include)
 		}
 		includeProgress.Increment()
 	}