Change text and repository links

Author: RobinRMC

cli.go

@@ -34,12 +34,12 @@ func main() {
 	InitGithubDownloader()
 	discords = FindDiscords()
 
-	var installFlag = flag.Bool("install", false, "Install Vencord on a Discord install")
+	var installFlag = flag.Bool("install", false, "Install Vencord+ on a Discord installation")
 	var updateFlag = flag.Bool("reinstall", false, "Reinstall & update Vencord")
-	var uninstallFlag = flag.Bool("uninstall", false, "Uninstall Vencord from a Discord install")
-	var installOpenAsar = flag.Bool("install-openasar", false, "Install OpenAsar on a Discord install")
-	var uninstallOpenAsar = flag.Bool("uninstall-openasar", false, "Uninstall OpenAsar from a Discord install")
-	var locationFlag = flag.String("location", "", "Select the location of your Discord install")
+	var uninstallFlag = flag.Bool("uninstall", false, "Uninstall Vencord from a Discord installation")
+	var installOpenAsar = flag.Bool("install-openasar", false, "Install OpenAsar on a Discord installation")
+	var uninstallOpenAsar = flag.Bool("uninstall-openasar", false, "Uninstall OpenAsar from a Discord installation")
+	var locationFlag = flag.String("location", "", "Select the location of your Discord installation")
 	var branchFlag = flag.String("branch", "", "Select the branch of Discord you want to modify [auto|stable|ptb|canary]")
 	flag.Parse()
 
@@ -57,7 +57,7 @@ func main() {
 		}
 	}
 
-	fmt.Println("Vencord Installer cli", InstallerTag, "("+InstallerGitHash+")")
+	fmt.Println("Vencord+ Installer CLI", InstallerTag, "("+InstallerGitHash+")")
 
 	var err error
 	if *installFlag {
@@ -103,7 +103,7 @@ func PromptDiscord(action, dir, branch string) *DiscordInstall {
 				}
 			}
 		}
-		die("No Discord install found. Try manually specifying it with the --dir flag")
+		die("No Discord installation found. Try manually specifying it with the --dir flag")
 	}
 
 	if branch != "" {
@@ -120,11 +120,11 @@ func PromptDiscord(action, dir, branch string) *DiscordInstall {
 		if discord := ParseDiscord(dir, branch); discord != nil {
 			return discord
 		} else {
-			die(dir + " is not a valid Discord install")
+			die(dir + " is not a valid Discord installation")
 		}
 	}
 
-	fmt.Println("Please choose a Discord install to", action)
+	fmt.Println("Please choose a Discord installation to", action)
 
 	for i, discord := range discords {
 		install := discord.(*DiscordInstall)
@@ -166,7 +166,7 @@ func InstallLatestBuilds() error {
 
 func HandleScuffedInstall() {
 	fmt.Println("Hold On!")
-	fmt.Println("You have a broken Discord Install.")
+	fmt.Println("You have a broken Discord installation.")
 	fmt.Println("Please reinstall Discord before proceeding!")
 	fmt.Println("Otherwise, Vencord will likely not work.")
 }

find_discord_darwin.go

@@ -49,7 +49,7 @@ func FindDiscords() []any {
 	for branch, dirname := range macosNames {
 		p := "/Applications/" + dirname
 		if discord := ParseDiscord(p, branch); discord != nil {
-			fmt.Println("Found Discord Install at", p)
+			fmt.Println("Found Discord installation at", p)
 			discords = append(discords, discord)
 		}
 	}

find_discord_linux.go

@@ -34,10 +34,10 @@ func init() {
 	}
 	if sudoUser != "" {
 		if sudoUser == "root" {
-			panic("VencordInstaller must not be run as the root user. Please rerun as normal user. Use sudo or doas to run as root.")
+			panic("VencordPlusInstaller must not be run as the root user. Please rerun as normal user. Use sudo or doas to run as root.")
 		}
 
-		fmt.Println("VencordInstaller was run with root privileges, actual user is", sudoUser)
+		fmt.Println("VencordPlusInstaller was run with root privileges, actual user is", sudoUser)
 		fmt.Println("Looking up HOME of", sudoUser)
 
 		u, err := user.Lookup(sudoUser)
@@ -48,7 +48,7 @@ func init() {
 			_ = os.Setenv("HOME", u.HomeDir)
 		}
 	} else if os.Getuid() == 0 {
-		panic("VencordInstaller was run as root but neither SUDO_USER nor DOAS_USER are set. Please rerun me as a normal user, with sudo/doas, or manually set SUDO_USER to your username")
+		panic("VencordPlusInstaller was run as root but neither SUDO_USER nor DOAS_USER are set. Please rerun me as a normal user, with sudo/doas, or manually set SUDO_USER to your username")
 	}
 	Home = os.Getenv("HOME")
 
@@ -87,7 +87,7 @@ func ParseDiscord(p, _ string) *DiscordInstall {
 		isSystemElectron = true
 		isPatched = ExistsFile(path.Join(p, "_app.asar.unpacked"))
 	} else {
-		fmt.Println("Tried to parse invalid Location:", p)
+		fmt.Println("Tried to parse invalid location:", p)
 		return nil
 	}
 
@@ -120,7 +120,7 @@ func FindDiscords() []any {
 
 			discordDir := path.Join(dir, name)
 			if discord := ParseDiscord(discordDir, ""); discord != nil {
-				fmt.Println("Found Discord install at ", discordDir)
+				fmt.Println("Found Discord installation at ", discordDir)
 				discords = append(discords, discord)
 			}
 		}
@@ -137,14 +137,14 @@ func FixOwnership(p string) error {
 		return nil
 	}
 
-	fmt.Println("Fixing Ownership of", p)
+	fmt.Println("Fixing ownership of", p)
 
 	sudoUser := os.Getenv("SUDO_USER")
 	if sudoUser == "" {
 		panic("SUDO_USER was empty. This point should never be reached")
 	}
 
-	fmt.Println("Looking up User", sudoUser)
+	fmt.Println("Looking up user", sudoUser)
 	u, err := user.Lookup(sudoUser)
 	if err != nil {
 		fmt.Println("Lookup failed:", err)

find_discord_windows.go

@@ -77,7 +77,7 @@ func FindDiscords() []any {
 	for branch, dirname := range windowsNames {
 		p := path.Join(appData, dirname)
 		if discord := ParseDiscord(p, branch); discord != nil {
-			fmt.Println("Found Discord install at ", p)
+			fmt.Println("Found Discord installation at ", p)
 			discords = append(discords, discord)
 		}
 	}

github_downloader.go

@@ -122,7 +122,7 @@ func InitGithubDownloader() {
 	//goland:noinspection GoUnhandledErrorResult
 	defer f.Close()
 
-	fmt.Println("Found existing Vencord Install. Checking for hash...")
+	fmt.Println("Found existing Vencord installation. Checking for hash...")
 	scanner := bufio.NewScanner(f)
 	if scanner.Scan() {
 		line := scanner.Text()

gui.go

@@ -67,7 +67,7 @@ func main() {
 		g.Update()
 	}()
 
-	win = g.NewMasterWindow("Vencord(Plus) Installer", 1200, 800, 0)
+	win = g.NewMasterWindow("Vencord+ Installer", 1200, 800, 0)
 
 	icon, _, err := image.Decode(bytes.NewReader(iconBytes))
 	if err != nil {
@@ -113,7 +113,7 @@ func InstallLatestBuilds() (err error) {
 
 	err = installLatestBuilds()
 	if err != nil {
-		ShowModal("Uh Oh!", "Failed to install the latest Vencord builds from GitHub:\n"+err.Error())
+		ShowModal("Uh Oh!", "Failed to install the latest Vencord+ builds from GitHub:\n"+err.Error())
 	}
 	return
 }
@@ -376,20 +376,20 @@ func renderInstaller() g.Widget {
 		g.Style().SetFontSize(20).To(
 			renderErrorCard(
 				DiscordYellow,
-				"**Github** and **vencord.dev** are the only official places to get Vencord. Any other site claiming to be us is malicious.\n"+
-					"If you downloaded from any other source, you should delete / uninstall everything immediately, run a malware scan and change your Discord password.",
+				"**GitHub** is the only official place to get Vencord+. Any other site claiming to be Vencord+ is malicious.\n"+
+					"If you downloaded Vencord+ from any other source, you should delete / uninstall everything immediately, run a malware scan and change your Discord password.",
 				90,
 			),
 		),
 
 		g.Dummy(0, 5),
 
 		g.Style().SetFontSize(30).To(
-			g.Label("Please select an install to patch"),
+			g.Label("Please select an installation to patch"),
 		),
 
 		&CondWidget{len(discords) == 0, func() g.Widget {
-			return g.Label("No Discord installs found. You first need to install Discord.")
+			return g.Label("No Discord installations found. You first need to install Discord.")
 		}, nil},
 
 		g.Style().SetFontSize(20).To(
@@ -466,7 +466,7 @@ func renderInstaller() g.Widget {
 						g.Button("Install").
 							OnClick(handlePatch).
 							Size((w-40)/4, 50),
-						Tooltip("Patch the selected Discord Install"),
+						Tooltip("Patch the selected Discord installation"),
 					),
 				g.Style().
 					SetColor(g.StyleColorButton, DiscordBlue).
@@ -492,7 +492,7 @@ func renderInstaller() g.Widget {
 						g.Button("Uninstall").
 							OnClick(handleUnpatch).
 							Size((w-40)/4, 50),
-						Tooltip("Unpatch the selected Discord Install"),
+						Tooltip("Unpatch the selected Discord installation"),
 					),
 				g.Style().
 					SetColor(g.StyleColorButton, Ternary(isOpenAsar, DiscordRed, DiscordGreen)).
@@ -506,22 +506,22 @@ func renderInstaller() g.Widget {
 		),
 
 		InfoModal("#patched", "Successfully Patched", "If Discord is still open, fully close it first.\n"+
-			"Then, start it and verify Vencord installed successfully by looking for its category in Discord Settings"),
+			"Then, start it and verify Vencord installed successfully by looking for its category in your Discord client's settings."),
 		InfoModal("#unpatched", "Successfully Unpatched", "If Discord is still open, fully close it first. Then start it again, it should be back to stock!"),
-		InfoModal("#scuffed-install", "Hold On!", "You have a broken Discord Install.\n"+
+		InfoModal("#scuffed-install", "Hold On!", "You have a broken Discord installation.\n"+
 			"Sometimes Discord decides to install to the wrong location for some reason!\n"+
 			"You need to fix this before patching, otherwise Vencord will likely not work.\n\n"+
-			"Use the below button to jump there and delete any folder called Discord or Squirrel.\n"+
-			"If the folder is now empty, feel free to go back a step and delete that folder too.\n"+
-			"Then see if Discord still starts. If not, reinstall it"),
+			"Use the button below to jump there and delete any folder called Discord or Squirrel.\n"+
+			"When the folder is empty, feel free to go back a step and delete that folder too.\n"+
+			"Now see if Discord still starts. If not, reinstall it"),
 		RawInfoModal("#openasar-confirm", "OpenAsar", "OpenAsar is an open-source alternative of Discord desktop's app.asar.\n"+
 			"Vencord is in no way affiliated with OpenAsar.\n"+
 			"You're installing OpenAsar at your own risk. If you run into issues with OpenAsar,\n"+
-			"no support will be provided, join the OpenAsar Server instead!\n\n"+
+			"no support will be provided. Join the OpenAsar Discord server instead!\n\n"+
 			"To install OpenAsar, press Accept and click 'Install OpenAsar' again.", true),
 		InfoModal("#openasar-patched", "Successfully Installed OpenAsar", "If Discord is still open, fully close it first. Then start it again and verify OpenAsar installed successfully!"),
 		InfoModal("#openasar-unpatched", "Successfully Uninstalled OpenAsar", "If Discord is still open, fully close it first. Then start it again and it should be back to stock!"),
-		InfoModal("#invalid-custom-location", "Invalid Location", "The specified location is not a valid Discord install. Make sure you select the base folder."),
+		InfoModal("#invalid-custom-location", "Invalid Location", "There is no valid Discord installation at the specified location. Make sure you select the base folder."),
 		InfoModal("#modal"+strconv.Itoa(modalId), modalTitle, modalMessage),
 	}
 
@@ -566,7 +566,7 @@ func loop() {
 		Layout(
 			g.Align(g.AlignCenter).To(
 				g.Style().SetFontSize(40).To(
-					g.Label("Vencord Installer"),
+					g.Label("Vencord+ Installer"),
 				),
 			),
 
@@ -595,15 +595,15 @@ func loop() {
 						if IsDevInstall {
 							return g.Label("Not updating Vencord due to being in DevMode")
 						}
-						return g.Label("Latest Vencord Version: " + LatestHash)
+						return g.Label("Latest Vencord+ version: " + LatestHash)
 					}, func() g.Widget {
-						return renderErrorCard(DiscordRed, "Failed to fetch Info from GitHub: "+GithubError.Error(), 40)
+						return renderErrorCard(DiscordRed, "Failed to fetch information from GitHub: "+GithubError.Error(), 40)
 					},
 				},
 				&CondWidget{
 					IsInstallerOutdated,
 					func() g.Widget {
-						return renderErrorCard(DiscordYellow, "This Installer is outdated!"+GetInstallerDownloadMarkdown(), 40)
+						return renderErrorCard(DiscordYellow, "This installer is outdated!"+GetInstallerDownloadMarkdown(), 40)
 					},
 					nil,
 				},

install.ps1

@@ -2,9 +2,9 @@ $DOWNLOAD_CLI = "https://github.com/RobinRMC/VencordPlusInstaller/releases/lates
 $DOWNLOAD_GUI = "https://github.com/RobinRMC/VencordPlusInstaller/releases/latest/download/VencordInstaller.exe"
 
 if ([Environment]::Is64BitOperatingSystem -and [System.Environment]::OSVersion.Version.Major -ge 10) {
-	Write-Output "=============================="
-	Write-Output "|      Vencord Installer     |"
-	Write-Output "=============================="
+	Write-Output "==============================="
+	Write-Output "|      Vencord+ Installer     |"
+	Write-Output "==============================="
 	Write-Output ""
 	Write-Output "Which installer version do you want to use?"
 	Write-Output "1) Graphical - More user friendly but may not work on old/low-end GPUs"
@@ -36,7 +36,7 @@ Write-Output ""
 
 if ($choice -eq 2) {
 	Write-Output "What do you want to do?"
-	Write-Output "1) Install Vencord"
+	Write-Output "1) Install Vencord+"
 	Write-Output "2) Install OpenAsar"
 	Write-Output "3) Uninstall Vencord"
 	Write-Output "4) Uninstall OpenAsar"

install.sh

@@ -28,7 +28,7 @@ curl -sS https://github.com/RobinRMC/VencordPlusInstaller/releases/latest/downlo
 chmod +x "$outfile"
 
 echo
-echo "Now running VencordInstaller"
+echo "Now running VencordPlusInstaller"
 echo "Do you want to run as root? [Y|n]"
 echo "This is necessary if Discord is in a root owned location like /usr/share or /opt"
 printf "> "
@@ -44,7 +44,7 @@ if [ -z "$opt" ] || [ "$opt" = y ] || [ "$opt" = yes ]; then
     echo "Running with doas"
     doas env "$@" "$outfile"
   else
-    echo "Neither sudo nor doas were found. Please install either of them to proceed."
+    echo "Neither sudo nor doas was found. Please install either of them to proceed."
   fi
 else
   echo "Running unprivileged"

self_updater.go

@@ -14,7 +14,7 @@ import (
 var IsInstallerOutdated = false
 
 func CheckSelfUpdate() {
-	fmt.Println("Checking for Installer Updates...")
+	fmt.Println("Checking for installer updates...")
 
 	res, err := GetGithubRelease(InstallerReleaseUrl, InstallerReleaseUrlFallback)
 	if err == nil {
@@ -25,9 +25,9 @@ func CheckSelfUpdate() {
 func GetInstallerDownloadLink() string {
 	switch runtime.GOOS {
 	case "windows":
-		return "https://github.com/Vencord/Installer/releases/latest/download/VencordInstaller.exe"
+		return "https://github.com/RobinRMC/VencordPlusInstaller/releases/latest/download/VencordInstaller.exe"
 	case "darwin":
-		return "https://github.com/Vencord/Installer/releases/latest/download/VencordInstaller.MacOS.zip"
+		return "https://github.com/RobinRMC/VencordPlusInstaller/releases/latest/download/VencordInstaller.MacOS.zip"
 	default:
 		return ""
 	}
@@ -38,5 +38,5 @@ func GetInstallerDownloadMarkdown() string {
 	if link == "" {
 		return ""
 	}
-	return " [Download the latest Installer](" + link + ")"
+	return " [Download the latest installer](" + link + ")"
 }