1.0.8

README.md

@@ -38,6 +38,7 @@ Download and extract the latest binary from the [releases](https://git.burkey.co
 
 1. Run `epochcli`. You will be taken through a setup process that configures the program and creates a config file at `$HOME/.config/epochcli/config.toml`
 2. You can now use `epochcli` as a standalone updater, but it can also act as a launcher based on your configuration. You can always run `epochcli -c` to redo the configuration, or edit the config file manually
+3. By default, `epochcli` will delete any non-standard patches. This can be disabled by changing the configuration file's `RemoveUnknownPatches` value to `false`
 
 ## Usage
 ```

config.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"bufio"
 	"fmt"
 	"github.com/BurntSushi/toml"
 	"os"
@@ -11,10 +12,11 @@ import (
 )
 
 type Config struct {
-	WowDir         string
+	WowDir               string
-	LaunchCmd      string
+	LaunchCmd            string
-	WinePrefix     string
+	WinePrefix           string
-	EnableLauncher bool
+	EnableLauncher       bool
+	RemoveUnknownPatches bool
 }
 
 const (
@@ -22,7 +24,10 @@ const (
 	configName    = "config.toml"
 )
 
-var cfgPath string
+var (
+	configRun = false
+	cfgPath   string
+)
 
 func setupConfig(rerun bool) (*Config, error) {
 	home, err := os.UserHomeDir()
@@ -32,20 +37,21 @@ func setupConfig(rerun bool) (*Config, error) {
 	cfgPath = filepath.Join(home, ".config", configDirName, configName)
 
 	newConfig := Config{
-		WowDir:         defaultWowPath,
+		WowDir:               defaultWowPath,
-		LaunchCmd:      defaultLaunchCmd,
+		LaunchCmd:            defaultLaunchCmd,
-		EnableLauncher: false,
+		EnableLauncher:       false,
+		RemoveUnknownPatches: true,
 	}
 
 	_, statErr := os.Stat(cfgPath)
 	if rerun || os.IsNotExist(statErr) {
+		configRun = true
 		fmt.Println("Enter the path to your Wow directory below. Use the full path without shortcuts like '~' (ex: /home/user/epoch):")
-		var s string
+		s, err := readLine()
-		_, err = fmt.Scanln(&s)
 		if err != nil {
 			return nil, fmt.Errorf("unable to read input: %v", err)
 		}
-		newConfig.WowDir = strings.TrimSpace(s)
+		newConfig.WowDir = s
 
 		fmt.Println()
 		p, err := promptYesNo(fmt.Sprintf("Do you want to use epochcli to launch Wow? Select No if you plan on using a launcher tool like Lutris (y/n): "))
@@ -81,7 +87,7 @@ func setupConfig(rerun bool) (*Config, error) {
 				if s == "" {
 					fmt.Printf("wine %s\n", newConfig.LaunchCmd)
 				} else {
-					fmt.Printf("WINEPREFIX=%s wine %s\n", newConfig.WinePrefix, newConfig.LaunchCmd)
+					fmt.Printf("WINEPREFIX=%s %s\n", newConfig.WinePrefix, newConfig.LaunchCmd)
 				}
 				fmt.Printf("Modify the configuration file at %s if you need to customize it\n\n", cfgPath)
 			}
@@ -94,14 +100,16 @@ func setupConfig(rerun bool) (*Config, error) {
 
 		file, err := os.Create(cfgPath)
 		if err != nil {
+			file.Close()
 			return nil, fmt.Errorf("unable to create config file: %v", err)
 		}
-		defer file.Close()
 
 		encoder := toml.NewEncoder(file)
 		if err = encoder.Encode(newConfig); err != nil {
+			file.Close()
 			return nil, fmt.Errorf("unable to encode config file: %v", err)
 		}
+		file.Close()
 
 		fmt.Printf("Created new config at %s\n\n", cfgPath)
 	}
@@ -111,18 +119,28 @@ func setupConfig(rerun bool) (*Config, error) {
 		return nil, err
 	}
 
+	// Rewrite config file with any new defaults
+	file, err := os.Create(cfgPath)
+	if err != nil {
+		return nil, fmt.Errorf("unable to config file: %v", err)
+	}
+	defer file.Close()
+
+	encoder := toml.NewEncoder(file)
+	if err = encoder.Encode(newConfig); err != nil {
+		return nil, fmt.Errorf("unable to encode config file: %v", err)
+	}
+
 	return &newConfig, nil
 }
 
 func promptYesNo(prompt string) (bool, error) {
-	var s string
 	for {
 		fmt.Print(prompt)
-		_, err := fmt.Scanf("%s", &s)
+		s, err := readLine()
 		if err != nil {
 			return false, fmt.Errorf("unable to read input: %v", err)
 		}
-		s := strings.TrimSpace(s)
 
 		if s == "y" || s == "Y" {
 			return true, nil
@@ -139,10 +157,18 @@ func input(prompt string) (string, error) {
 	fmt.Println(prompt)
 	fmt.Printf("> ")
 
-	var s string
+	s, err := readLine()
-	_, err := fmt.Scanf("%s", &s)
 	if err != nil {
 		return "", fmt.Errorf("unable to read input: %v", err)
 	}
-	return strings.TrimSpace(s), nil
+	return s, nil
+}
+
+func readLine() (string, error) {
+	reader := bufio.NewReader(os.Stdin)
+	in, err := reader.ReadString('\n')
+	if err != nil {
+		return "", fmt.Errorf("unable to read input: %v", err)
+	}
+	return strings.TrimSpace(in), nil
 }

main.go

@@ -6,12 +6,13 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"io/fs"
 	"log"
 	"net/http"
 	"os"
 	"os/exec"
 	"path/filepath"
-	"runtime"
+	"regexp"
 	"strings"
 )
 
@@ -70,6 +71,11 @@ func main() {
 		fmt.Printf("%d files are already up to date\n\n", stats.current)
 	}
 
+	if configRun {
+		fmt.Println("Configuration complete!")
+		os.Exit(0)
+	}
+
 	if updateOnlyFlag {
 		os.Exit(0)
 	}
@@ -81,9 +87,6 @@ func main() {
 
 		fmt.Println("Starting Epoch...")
 		var cmd = strings.Split(config.LaunchCmd, " ")
-		if runtime.GOOS == "darwin" {
-			cmd = append([]string{"open"}, cmd...)
-		}
 		ex := exec.Command(cmd[0], cmd[1:]...)
 		cmdStr := strings.Join(cmd, " ")
 		if config.WinePrefix != "" {
@@ -174,5 +177,40 @@ func downloadUpdate(config *Config, force bool) (DownloadStats, error) {
 		stats.updated += 1
 	}
 
+	if config.RemoveUnknownPatches {
+		patches := make([]string, 0)
+		patchreg := regexp.MustCompile(`patch-[A-Za-z].MPQ`)
+
+		for _, file := range manifest.Files {
+			if patchreg.MatchString(file.Path) {
+				patches = append(patches, strings.Split(file.Path, "Data\\")[1])
+			}
+		}
+
+		err = filepath.WalkDir(filepath.Join(config.WowDir, "Data"), func(path string, d fs.DirEntry, err error) error {
+			if !d.IsDir() && patchreg.MatchString(d.Name()) {
+				del := true
+				for _, patch := range patches {
+					if patch == d.Name() {
+						del = false
+						break
+					}
+				}
+				if del {
+					err = os.Remove(path)
+					if err != nil {
+						return err
+					}
+					fmt.Println("Removed unknown patch", d.Name())
+				}
+			}
+			return nil
+		})
+
+		if err != nil {
+			log.Fatalf("failed to delete unknown patches: %s", err)
+		}
+	}
+
 	return stats, nil
 }

version.go

@@ -7,7 +7,7 @@ import (
 	"regexp"
 )
 
-const version = "1.0.6"
+const version = "1.0.8"
 const versionUrl = "https://git.burkey.co/eburk/epochcli/raw/branch/master/version.go"
 
 func needUpdate() (bool, error) {