1.0.7

Reviewed-on: #1

README.md

@@ -2,20 +2,21 @@
 
 CLI tool for updating and launching [Project Epoch](https://www.project-epoch.net/) on Windows, Linux and macOS.
 
-## Setup
-
-### Windows
-
-Download and extract the latest binary from the [releases](https://git.burkey.co/eburk/epochcli/releases) page or build from source yourself, then copy `epochcli.exe` to a location of your choice. To make it easy, just use the same folder as your Wow game files.
+## Installing
 
 ### Linux
+
 A `wine` prefix with `dxvk` installed is sufficient, or you can use something like Lutris or faugus-launcher and just use `epochcli` for updating.
 
-Download and extract the latest binary from the [releases](https://git.burkey.co/eburk/epochcli/releases) page, build from source yourself, or use homebrew to install.
+Download and extract the latest binary from the [releases](https://git.burkey.co/eburk/epochcli/releases) page, build from source yourself, or use homebrew from the macOS instructions to install.
+
+If you are an Arch Linux (or derivative) user, you can use the provided [AUR package](https://aur.archlinux.org/packages/epochcli) to install
+
+A tutorial for the full setup of Epoch on Arch Linux [can be found here](https://burkey.co/posts/epoch-linux/)
 
 ### macOS
 
-For macOS, I've found the best way to run Wow is in a Parallels Win 11 VM. Kegworks, Codeweavers, etc crash when the game starts up and I have not found a good solution so far. Any suggestions would be welcome, see my contact information below.
+For macOS, I've found the best way to run Wow is in a Parallels Win 11 VM. Kegworks, Codeweavers, etc crash when the game starts up and I have not found a good solution so far. Any suggestions would be welcome, see my contact information below. I currently use a Parallels VM and run the Windows version of epochcli inside the VM as an updater and launcher.
 
 You can easily install with homebrew or build from source yourself. I dont have time to setup codesigning right now so there are no binaries provided for macOS. For homebrew, do the following:
 
@@ -27,10 +28,16 @@ brew install --HEAD epochcli
 brew upgrade epochcli --fetch-HEAD
 ```
 
-## First Run
+### Windows
+
+Download and extract the latest binary from the [releases](https://git.burkey.co/eburk/epochcli/releases) page or build from source yourself, then copy `epochcli.exe` to a location of your choice. To make it easy, just use the same folder as your Wow game files.
+
+## Setup
+
+![ss](ss.png)
 
 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 just a standalone updater or also a launcher based on your configuration. You can always run `epochcli -c` to redo the configuration or edit the config file manually
+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
 
 ## Usage
 ```
@@ -43,4 +50,4 @@ brew upgrade epochcli --fetch-HEAD
 
 ## Issues
 
-If you have any issues, [email me](mailto:evan@burkey.co) or ping `Battlehammer` on the Epoch discord
+If you have any issues, [email me](mailto:epochcli@burkey.co) or send a private message to `Battlehammer` on the Epoch discord

config.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"bufio"
 	"fmt"
 	"github.com/BurntSushi/toml"
 	"os"
@@ -13,6 +14,7 @@ import (
 type Config struct {
 	WowDir         string
 	LaunchCmd      string
+	WinePrefix     string
 	EnableLauncher bool
 }
 
@@ -21,7 +23,10 @@ const (
 	configName    = "config.toml"
 )
 
-var cfgPath string
+var (
+	configRun = false
+	cfgPath   string
+)
 
 func setupConfig(rerun bool) (*Config, error) {
 	home, err := os.UserHomeDir()
@@ -38,60 +43,52 @@ func setupConfig(rerun bool) (*Config, error) {
 
 	_, statErr := os.Stat(cfgPath)
 	if rerun || os.IsNotExist(statErr) {
-		fmt.Println("Enter the path to your Wow directory below:")
-		var s string
-		_, err = fmt.Scanln(&s)
+		configRun = true
+		fmt.Println("Enter the path to your Wow directory below. Use the full path without shortcuts like '~' (ex: /home/user/epoch):")
+		s, err := readLine()
 		if err != nil {
 			return nil, fmt.Errorf("unable to read input: %v", err)
 		}
-		newConfig.WowDir = strings.TrimSpace(s)
+		newConfig.WowDir = s
 
-		for {
-			fmt.Printf("Do you want to use epochcli to launch Wow? Select No if you plan on using a launcher tool like Lutris (y/n): ")
-			_, err = fmt.Scanf("%s", &s)
-			if err != nil {
-				return nil, fmt.Errorf("unable to read input: %v", err)
-			}
-			s = strings.TrimSpace(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): "))
+		if err != nil {
+			return nil, err
+		}
+		fmt.Println()
 
-			if s == "y" || s == "Y" {
-				newConfig.EnableLauncher = true
+		if p {
+			newConfig.EnableLauncher = true
+			newConfig.LaunchCmd = path.Join(newConfig.WowDir, "Project-Epoch.exe")
 
-				if runtime.GOOS == "windows" {
-					newConfig.LaunchCmd = path.Join(newConfig.WowDir, "Project-Epoch.exe")
-					exePath, err := os.Executable()
-					if err != nil {
-						fmt.Println("unable to create desktop shortcut: ", err)
-						break
-					}
-					err = makeLink(exePath, path.Join(home, "Desktop", "Project-Epoch.lnk"))
-					if err != nil {
-						fmt.Println("unable to create desktop shortcut: ", err)
-					}
-					break
-				} else {
-					fmt.Println("Enter your launch command to start Wow below. If you would rather configure this later in the configuration file, just press Enter")
-					fmt.Printf("> ")
-
-					_, err = fmt.Scanf("%s", &s)
-					if err != nil {
-						return nil, fmt.Errorf("unable to read input: %v", err)
-					}
-					s = strings.TrimSpace(s)
-
-					if s != "" {
-						newConfig.LaunchCmd = s
-					}
-
-					break
+			if runtime.GOOS == "windows" {
+				exePath, err := os.Executable()
+				if err != nil {
+					return nil, fmt.Errorf("unable to create desktop shortcut: %v", err)
 				}
-			}
+				err = makeLink(exePath, path.Join(home, "Desktop", "Project-Epoch.lnk"))
+				if err != nil {
+					return nil, fmt.Errorf("unable to create desktop shortcut: %v", err)
+				}
+			} else {
+				s, err = input("Enter your wine prefix. Leave blank if you do not need to set WINEPREFIX")
+				if err != nil {
+					return nil, err
+				}
+				fmt.Println()
 
-			if s == "n" || s == "N" {
-				break
-			}
+				newConfig.WinePrefix = s
+				newConfig.LaunchCmd = "wine " + newConfig.LaunchCmd
 
-			fmt.Println("Please enter a valid value of either 'y' or 'n'")
+				fmt.Println("Your launch command has been set to the following:")
+				if s == "" {
+					fmt.Printf("wine %s\n", newConfig.LaunchCmd)
+				} else {
+					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)
+			}
 		}
 
 		err = os.MkdirAll(filepath.Join(home, ".config", configDirName), 0755)
@@ -110,7 +107,7 @@ func setupConfig(rerun bool) (*Config, error) {
 			return nil, fmt.Errorf("unable to encode config file: %v", err)
 		}
 
-		fmt.Println("Created new config at ", cfgPath)
+		fmt.Printf("Created new config at %s\n\n", cfgPath)
 	}
 
 	_, err = toml.DecodeFile(cfgPath, &newConfig)
@@ -120,3 +117,42 @@ func setupConfig(rerun bool) (*Config, error) {
 
 	return &newConfig, nil
 }
+
+func promptYesNo(prompt string) (bool, error) {
+	for {
+		fmt.Print(prompt)
+		s, err := readLine()
+		if err != nil {
+			return false, fmt.Errorf("unable to read input: %v", err)
+		}
+
+		if s == "y" || s == "Y" {
+			return true, nil
+		}
+
+		if s == "n" || s == "N" {
+			return false, nil
+		}
+		fmt.Println("Please enter a valid value of either 'y' or 'n'")
+	}
+}
+
+func input(prompt string) (string, error) {
+	fmt.Println(prompt)
+	fmt.Printf("> ")
+
+	s, err := readLine()
+	if err != nil {
+		return "", fmt.Errorf("unable to read input: %v", err)
+	}
+	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

@@ -11,17 +11,26 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"runtime"
 	"strings"
 )
 
 const (
-	manifestUrl      = "https://updater.project-epoch.net/api/manifest"
+	manifestUrl      = "https://updater.project-epoch.net/api/v2/manifest"
 	defaultWowPath   = "/path/to/wow"
 	defaultLaunchCmd = "not configured"
 )
 
 func main() {
+	outOfDate, err := needUpdate()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	if outOfDate {
+		fmt.Println("There is a new version of epochcli, you must update before running")
+		os.Exit(1)
+	}
+
 	var (
 		helpFlag       bool
 		updateOnlyFlag bool
@@ -55,9 +64,14 @@ func main() {
 		log.Fatal(err)
 	}
 
-	fmt.Printf("%d files updated\n", stats.updated)
+	fmt.Printf("%d files updated\n\n", stats.updated)
 	if stats.current > 0 {
-		fmt.Printf("%d files are already up to date\n", stats.current)
+		fmt.Printf("%d files are already up to date\n\n", stats.current)
+	}
+
+	if configRun {
+		fmt.Println("Configuration complete!")
+		os.Exit(0)
 	}
 
 	if updateOnlyFlag {
@@ -70,10 +84,19 @@ func main() {
 		}
 
 		fmt.Println("Starting Epoch...")
-		if runtime.GOOS == "darwin" {
-			exec.Command("open", config.LaunchCmd).Run()
-		} else {
-			exec.Command(config.LaunchCmd).Run()
+		var cmd = strings.Split(config.LaunchCmd, " ")
+		ex := exec.Command(cmd[0], cmd[1:]...)
+		cmdStr := strings.Join(cmd, " ")
+		if config.WinePrefix != "" {
+			prefix := fmt.Sprintf("WINEPREFIX=%s", config.WinePrefix)
+			newEnv := append(os.Environ(), prefix)
+			ex.Env = newEnv
+			cmdStr = prefix + " " + cmdStr
+		}
+		fmt.Println("Running command:", cmdStr)
+		err = ex.Run()
+		if err != nil {
+			log.Fatal(err)
 		}
 	}
 }
@@ -98,7 +121,10 @@ func downloadUpdate(config *Config, force bool) (DownloadStats, error) {
 		localPath := filepath.Join(config.WowDir, path)
 		localDir := filepath.Dir(localPath)
 		if _, err = os.Stat(localDir); os.IsNotExist(err) {
-			os.MkdirAll(localDir, 0755)
+			err = os.MkdirAll(localDir, 0755)
+			if err != nil {
+				return stats, fmt.Errorf("failed to create directory %s: %v", localDir, err)
+			}
 		}
 
 		if !force {
@@ -117,28 +143,35 @@ func downloadUpdate(config *Config, force bool) (DownloadStats, error) {
 			}
 		}
 
-		fmt.Printf(" %s...\n", localPath)
+		fmt.Printf("Updating %s...\n", localPath)
 
 		outFile, err := os.Create(localPath)
 		if err != nil {
 			return stats, err
 		}
-		defer outFile.Close()
 
-		resp, err := http.Get(file.URL)
-		if err != nil {
-			return stats, err
-		}
-		defer resp.Body.Close()
-		if resp.StatusCode != http.StatusOK {
-			return stats, fmt.Errorf("failed to download update from %s, status code: %d", file.URL, resp.StatusCode)
-		}
-
-		_, err = io.Copy(outFile, resp.Body)
-		if err != nil {
-			return stats, err
+		for _, url := range []string{file.Urls.Cloudflare, file.Urls.Digitalocean, file.Urls.None} {
+			resp, err := http.Get(url)
+			if err != nil {
+				outFile.Close()
+				return stats, err
+			}
+			defer resp.Body.Close()
+			if resp.StatusCode != http.StatusOK {
+				outFile.Close()
+				return stats, fmt.Errorf("failed to download update from %s, status code: %d", url, resp.StatusCode)
+			}
+
+			_, err = io.Copy(outFile, resp.Body)
+			if err != nil {
+				outFile.Close()
+				return stats, err
+			}
+
+			break
 		}
 
+		outFile.Close()
 		stats.updated += 1
 	}
 

manifest.go

@@ -11,13 +11,18 @@ type File struct {
 	Hash   string `json:"Hash"`
 	Size   int    `json:"Size"`
 	Custom bool   `json:"Custom"`
-	URL    string `json:"URL"`
-	Origin string `json:"Origin"`
+	Urls   struct {
+		Digitalocean string `json:"digitalocean"`
+		Cloudflare   string `json:"cloudflare"`
+		None         string `json:"none"`
+	} `json:"Urls"`
 }
 
 type Manifest struct {
-	Version string `json:"Version"`
-	Files   []File `json:"Files"`
+	Version   string `json:"Version"`
+	UID       string `json:"Uid"`
+	Files     []File `json:"Files"`
+	CheckedAt string `json:"checked_at"`
 }
 
 func getManifest() (*Manifest, error) {

release.sh

@@ -3,20 +3,20 @@
 set -e
 
 rm -f ./*.tar.gz
-rm -rf bin
+rm -f ./*.zip
 
-mkdir bin
+GOOS=linux GOARCH=amd64 go build -o epochcli
+tar czvf epochcli-linux-amd64.tar.gz epochcli
+rm ./epochcli
 
-GOOS=linux GOARCH=amd64 go build -o bin/epochcli-linux-amd64
-tar czvf epochcli-linux-amd64.tar.gz bin/epochcli-linux-amd64
+GOOS=linux GOARCH=arm64 go build -o epochcli
+tar czvf epochcli-linux-arm64.tar.gz epochcli
+rm ./epochcli
 
-GOOS=linux GOARCH=arm64 go build -o bin/epochcli-linux-arm64
-tar czvf epochcli-linux-arm64.tar.gz bin/epochcli-linux-arm64
+GOOS=windows GOARCH=amd64 go build -o epochcli.exe
+zip -j epochcli-windows-amd64.zip epochcli.exe
+rm ./epochcli.exe
 
-GOOS=windows GOARCH=amd64 go build -o bin/epochcli-windows-amd64
-zip epochcli-windows-amd64.zip bin/epochcli-windows-amd64
-
-GOOS=windows GOARCH=arm64 go build -o bin/epochcli-windows-arm64
-zip epochcli-windows-arm64.zip bin/epochcli-windows-arm64
-
-rm -rf bin
+GOOS=windows GOARCH=arm64 go build -o epochcli.exe
+zip -j epochcli-windows-arm64.zip epochcli.exe
+rm ./epochcli.exe

version.go

@@ -0,0 +1,36 @@
+package main
+
+import (
+	"fmt"
+	"io"
+	"net/http"
+	"regexp"
+)
+
+const version = "1.0.7"
+const versionUrl = "https://git.burkey.co/eburk/epochcli/raw/branch/master/version.go"
+
+func needUpdate() (bool, error) {
+	resp, err := http.Get(versionUrl)
+	if err != nil {
+		return false, fmt.Errorf("unable to get version file: %v", err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return false, fmt.Errorf("failed to download update, status code: %d", resp.StatusCode)
+	}
+
+	b, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return false, fmt.Errorf("unable to read response body: %v", err)
+	}
+
+	re := regexp.MustCompile(`const version = "([\d.]+)"`)
+	ver := re.FindStringSubmatch(string(b))
+	if len(ver) < 2 || ver[1] == "" {
+		return false, fmt.Errorf("unable to find version in response")
+	}
+
+	return ver[1] != version, nil
+}