Merge pull request #148 from legendu-net/dev

dclong · web-flow · commit 859031204333 · 2025-12-08T23:10:02.000-08:00
Merge dev into main
diff --git a/.golangci.yml b/.golangci.yml
@@ -136,6 +136,11 @@ linters:
           disabled: true
         - name: unused-parameter
         - name: unused-receiver
+    staticcheck:
+      checks:
+        - "all"
+        - "-SA9003"
+
 
   exclusions:
     presets:
diff --git a/.idx/dev.nix b/.idx/dev.nix
@@ -14,6 +14,7 @@
     fzf
     util-linux
     go
+    golangci-lint
     uv
     dos2unix
   ];
diff --git a/cmd/ai/pytorch.go b/cmd/ai/pytorch.go
@@ -22,10 +22,8 @@ func pytorch(cmd *cobra.Command, _ []string) {
 		utils.RunCmd(command)
 	}
 	if utils.GetBoolFlag(cmd, "config") {
-		// nothing to configure
 	}
 	if utils.GetBoolFlag(cmd, "uninstall") {
-		// TODO
 	}
 }
 
diff --git a/cmd/bigdata/arrowdb.go b/cmd/bigdata/arrowdb.go
@@ -13,10 +13,7 @@ func linkArrowDbProfileFromHost() {
 	dstProfile := filepath.Join(utils.UserHomeDir(), ".arrowdb_profile")
 	if utils.ExistsFile(srcProfile) {
 		// inside a Docker container, link profile from host
-		if utils.ExistsFile(dstProfile) {
-			utils.RemoveAll(dstProfile)
-		}
-		utils.Symlink(srcProfile, dstProfile)
+		utils.Symlink(srcProfile, dstProfile, false)
 	}
 }
 
diff --git a/cmd/data.go b/cmd/data.go
@@ -8,14 +8,14 @@ import (
 )
 
 // Pull data for icon from GitHub into ~/.config/icon-data.
-func data(cmd *cobra.Command, args []string) {
+func data(cmd *cobra.Command, _ []string) {
 	dir := "~/.config/icon-data"
 	if !utils.GetBoolFlag(cmd, "force") && utils.ExistsDir(dir+"/.git") {
 		fmt.Println("Using existing data in ~/.config/icon-data.")
 		return
 	}
 
-	utils.BackupDir(dir, "")
+	utils.Backup(dir, "")
 	utils.MkdirAll(dir, 0o700)
 
 	command := utils.Format(`git clone {gitUrl} {dir} \
diff --git a/cmd/dev/git.go b/cmd/dev/git.go
@@ -36,7 +36,7 @@ func installGitUi(cmd *cobra.Command) {
 }
 
 func linkGitUiFiles(baseDir string) {
-	utils.SymlinkIntoDir("~/.config/icon-data/git/gitui/key_bindings.ron", filepath.Join(baseDir, "gitui"))
+	utils.SymlinkIntoDir("~/.config/icon-data/git/gitui/key_bindings.ron", filepath.Join(baseDir, "gitui"), true)
 }
 
 func configGitUi(cmd *cobra.Command) {
@@ -124,7 +124,7 @@ func git(cmd *cobra.Command, args []string) {
 	}
 	if utils.GetBoolFlag(cmd, "config") {
 		network.SshClient(cmd, args)
-		utils.Symlink("~/.config/icon-data/git/gitconfig", "~/.gitconfig")
+		utils.Symlink("~/.config/icon-data/git/gitconfig", "~/.gitconfig", true)
 		configGitProxy(cmd)
 		configGitUi(cmd)
 	}
diff --git a/cmd/dev/golang.go b/cmd/dev/golang.go
@@ -60,7 +60,7 @@ func installGoPls(prefix string) {
 }
 
 // Install and configure Golang.
-func golang(cmd *cobra.Command, args []string) {
+func golang(cmd *cobra.Command, _ []string) {
 	prefix := utils.GetCommandPrefix(false, map[string]uint32{
 		"/usr/local/go":  unix.W_OK | unix.R_OK,
 		"/usr/local":     unix.W_OK | unix.R_OK,
diff --git a/cmd/dev/pytype.go b/cmd/dev/pytype.go
@@ -11,7 +11,7 @@ import (
 )
 
 // Install and configure pytype.
-func pytype(cmd *cobra.Command, args []string) {
+func pytype(cmd *cobra.Command, _ []string) {
 	if utils.GetBoolFlag(cmd, "install") {
 		command := utils.Format("{pip_install} pytype", map[string]string{
 			"pip_install": utils.BuildPipInstall(cmd),
diff --git a/cmd/dev/rust.go b/cmd/dev/rust.go
@@ -104,7 +104,7 @@ func installCargoBinstall() {
 }
 
 // Install and configure Rust.
-func rust(cmd *cobra.Command, args []string) {
+func rust(cmd *cobra.Command, _ []string) {
 	rustupHome := utils.GetStringFlag(cmd, "rustup-home")
 	if rustupHome == "" {
 		rustupHome = filepath.Join(utils.UserHomeDir(), ".rustup")
diff --git a/cmd/ide/neovim.go b/cmd/ide/neovim.go
@@ -8,7 +8,7 @@ import (
 )
 
 // Install and configure neovim.
-func neovim(cmd *cobra.Command, args []string) {
+func neovim(cmd *cobra.Command, _ []string) {
 	Neovim(
 		utils.GetBoolFlag(cmd, "install"),
 		utils.GetBoolFlag(cmd, "config"),
@@ -58,8 +58,7 @@ func Neovim(install bool, config bool, uninstall bool, yes_s string) {
 	}
 	if config {
 		dir := "~/.config/nvim"
-		utils.BackupDir(dir, "")
-		utils.Symlink("~/.config/icon-data/nvim", dir)
+		utils.Symlink("~/.config/icon-data/nvim", dir, true)
 	}
 	if uninstall {
 		switch runtime.GOOS {
diff --git a/cmd/ide/vscode.go b/cmd/ide/vscode.go
@@ -9,7 +9,7 @@ import (
 )
 
 // Install and configure Visual Studio Code.
-func vscode(cmd *cobra.Command, args []string) {
+func vscode(cmd *cobra.Command, _ []string) {
 	if utils.GetBoolFlag(cmd, "install") {
 		switch runtime.GOOS {
 		case "linux":
@@ -52,7 +52,7 @@ func vscode(cmd *cobra.Command, args []string) {
 		if utils.GetBoolFlag(cmd, "copy") {
 			utils.CopyFileToDir("~/.config/icon-data/vscode/settings.json", userDir)
 		} else {
-			utils.SymlinkIntoDir("~/.config/icon-data/vscode/settings.json", userDir)
+			utils.SymlinkIntoDir("~/.config/icon-data/vscode/settings.json", userDir, true)
 		}
 	}
 	if utils.GetBoolFlag(cmd, "uninstall") {
diff --git a/cmd/jupyter/ganymede.go b/cmd/jupyter/ganymede.go
@@ -11,7 +11,7 @@ import (
 )
 
 // Install and configure Ganymede.
-func ganymede(cmd *cobra.Command, args []string) {
+func ganymede(cmd *cobra.Command, _ []string) {
 	if utils.GetBoolFlag(cmd, "install") {
 		tmpdir := utils.CreateTempDir("")
 		defer os.RemoveAll(tmpdir)
diff --git a/cmd/jupyter/ipython.go b/cmd/jupyter/ipython.go
@@ -8,7 +8,7 @@ import (
 )
 
 // Install and configure IPython.
-func ipython(cmd *cobra.Command, args []string) {
+func ipython(cmd *cobra.Command, _ []string) {
 	if utils.GetBoolFlag(cmd, "install") {
 		command := utils.Format("{prefix} {pip_install} ipython", map[string]string{
 			"prefix": utils.GetCommandPrefix(
@@ -24,10 +24,10 @@ func ipython(cmd *cobra.Command, args []string) {
 		profile_default := filepath.Join(profile_dir, "profile_default")
 		utils.Symlink(
 			"~/.config/icon-data/ipython/startup.ipy",
-			filepath.Join(profile_default, "startup/startup.ipy"))
+			filepath.Join(profile_default, "startup/startup.ipy"), true)
 		utils.SymlinkIntoDir(
 			"~/.config/icon-data/ipython/ipython_config.py",
-			profile_default)
+			profile_default, true)
 	}
 	if utils.GetBoolFlag(cmd, "uninstall") {
 		command := utils.Format("{prefix} {pip_uninstall} ipython", map[string]string{
diff --git a/cmd/jupyter/jupyter_book.go b/cmd/jupyter/jupyter_book.go
@@ -8,7 +8,7 @@ import (
 )
 
 // Install and configure jupyter_book.
-func jupyter_book(cmd *cobra.Command, args []string) {
+func jupyter_book(cmd *cobra.Command, _ []string) {
 	if utils.GetBoolFlag(cmd, "install") {
 		command := utils.Format("{pip_install} jupyter-book", map[string]string{
 			"pip_install": utils.BuildPipInstall(cmd),
diff --git a/cmd/jupyter/jupyterlab_vim.go b/cmd/jupyter/jupyterlab_vim.go
@@ -6,7 +6,7 @@ import (
 )
 
 // Install and configure the jupyterlab_vim extension for JupyterLab.
-func jupyterlab_vim(cmd *cobra.Command, args []string) {
+func jupyterlab_vim(cmd *cobra.Command, _ []string) {
 	prefix := utils.GetCommandPrefix(
 		utils.GetBoolFlag(cmd, "sudo"),
 		map[string]uint32{},
diff --git a/cmd/network/github.go b/cmd/network/github.go
@@ -83,7 +83,7 @@ func GetLatestRelease(releaseUrl string) ReleaseInfo {
 // Download a release from GitHub.
 // @param args: The arguments to parse.
 // If None, the arguments from command-line are parsed.
-func DownloadGitHubReleaseArgs(cmd *cobra.Command, args []string) {
+func DownloadGitHubReleaseArgs(cmd *cobra.Command, _ []string) {
 	DownloadGitHubRelease(
 		utils.GetStringFlag(cmd, "repo"),
 		utils.GetStringFlag(cmd, "version"),
diff --git a/cmd/network/ssh_client.go b/cmd/network/ssh_client.go
@@ -34,11 +34,11 @@ func adjustPathInConfig() {
 }
 
 // Install and configure SSH client.
-func SshClient(cmd *cobra.Command, args []string) {
+func SshClient(cmd *cobra.Command, _ []string) {
 	if utils.GetBoolFlag(cmd, "install") {
 	}
 	if utils.GetBoolFlag(cmd, "config") {
-		utils.SymlinkIntoDir("~/.config/icon-data/ssh/client/config", sshHome)
+		utils.SymlinkIntoDir("~/.config/icon-data/ssh/client/config", sshHome, true)
 		copySshcSettingsFromHost()
 		utils.MkdirAll(filepath.Join(sshHome, "control"), 0o700)
 		/*
diff --git a/cmd/network/ssh_server.go b/cmd/network/ssh_server.go
@@ -6,7 +6,7 @@ import (
 )
 
 // Install and configure SSH server.
-func SshServer(cmd *cobra.Command, args []string) {
+func SshServer(cmd *cobra.Command, _ []string) {
 	if utils.GetBoolFlag(cmd, "install") {
 		if utils.IsDebianUbuntuSeries() {
 			command := utils.Format("{prefix} apt-get update && {prefix} apt-get install {yes_s} openssh-server fail2ban", map[string]string{
diff --git a/cmd/shell/alacritty.go b/cmd/shell/alacritty.go
@@ -8,7 +8,7 @@ import (
 )
 
 // Install and configure the Alacritty terminal.
-func alacritty(cmd *cobra.Command, args []string) {
+func alacritty(cmd *cobra.Command, _ []string) {
 	if utils.GetBoolFlag(cmd, "install") {
 		switch runtime.GOOS {
 		case "linux":
diff --git a/cmd/shell/atuin.go b/cmd/shell/atuin.go
@@ -9,7 +9,7 @@ import (
 )
 
 // Install atuin.
-func atuin(cmd *cobra.Command, args []string) {
+func atuin(cmd *cobra.Command, _ []string) {
 	if utils.GetBoolFlag(cmd, "install") {
 		command := "bash <(curl https://raw.githubusercontent.com/ellie/atuin/main/install.sh)"
 		utils.RunCmd(command)
diff --git a/cmd/shell/bash_it.go b/cmd/shell/bash_it.go
@@ -9,7 +9,7 @@ import (
 
 // Install bash-it, a community Bash framework.
 // For more details, please refer to https://github.com/Bash-it/bash-it#installation.
-func bashIt(cmd *cobra.Command, args []string) {
+func bashIt(cmd *cobra.Command, _ []string) {
 	home := utils.UserHomeDir()
 	if utils.GetBoolFlag(cmd, "install") {
 		dir := filepath.Join(home, ".bash_it")
@@ -23,7 +23,7 @@ func bashIt(cmd *cobra.Command, args []string) {
 	}
 	if utils.GetBoolFlag(cmd, "config") {
 		utils.ConfigBash()
-		utils.Symlink("~/.config/icon-data/bash-it", "~/.bash_it")
+		utils.Symlink("~/.config/icon-data/bash-it", "~/.bash_it", true)
 	}
 	if utils.GetBoolFlag(cmd, "uninstall") {
 		utils.RunCmd("~/.bash_it/uninstall.sh && rm -rf ~/.bash_it/")
diff --git a/cmd/shell/fish.go b/cmd/shell/fish.go
@@ -75,7 +75,7 @@ func generateCrazyCompletions() {
 }
 
 // Install and config the fish shell.
-func fish(cmd *cobra.Command, args []string) {
+func fish(cmd *cobra.Command, _ []string) {
 	if utils.GetBoolFlag(cmd, "install") {
 		switch runtime.GOOS {
 		case "linux":
@@ -92,8 +92,7 @@ func fish(cmd *cobra.Command, args []string) {
 	}
 	if utils.GetBoolFlag(cmd, "config") {
 		dir := "~/.config/fish"
-		utils.BackupDir(dir, "")
-		utils.Symlink("~/.config/icon-data/fish", dir)
+		utils.Symlink("~/.config/icon-data/fish", dir, true)
 
 		generateCompletions()
 		generateCrazyCompletions()
diff --git a/cmd/shell/hyper.go b/cmd/shell/hyper.go
@@ -56,7 +56,7 @@ func hyper(cmd *cobra.Command, _ []string) {
 		log.Printf("Hyper plugins hypercwd, hyper-search, hyper-pane and hyperpower are installed.\n")
 		utils.Symlink(
 			"~/.config/icon-data/hyper/hyper.js",
-			"~/.hyper.js")
+			"~/.hyper.js", true)
 	}
 	if utils.GetBoolFlag(cmd, "uninstall") {
 		switch runtime.GOOS {
diff --git a/cmd/shell/zellij.go b/cmd/shell/zellij.go
@@ -11,7 +11,7 @@ import (
 )
 
 // Install and configure Ganymede.
-func zellij(cmd *cobra.Command, args []string) {
+func zellij(cmd *cobra.Command, _ []string) {
 	if utils.GetBoolFlag(cmd, "install") {
 		tmpdir := utils.CreateTempDir("")
 		defer os.RemoveAll(tmpdir)
@@ -34,7 +34,7 @@ func zellij(cmd *cobra.Command, args []string) {
 		utils.RunCmd(command)
 	}
 	if utils.GetBoolFlag(cmd, "config") {
-		utils.Symlink("~/.config/icon-data/zellij/config.kdl", "~/.config/zellij/config.kdl")
+		utils.Symlink("~/.config/icon-data/zellij/config.kdl", "~/.config/zellij/config.kdl", true)
 	}
 	if utils.GetBoolFlag(cmd, "uninstall") {
 	}
diff --git a/cmd/update.go b/cmd/update.go
@@ -7,7 +7,7 @@ import (
 )
 
 // Update icon.
-func update(cmd *cobra.Command, args []string) {
+func update(cmd *cobra.Command, _ []string) {
 	dir := utils.GetStringFlag(cmd, "install-dir")
 	command := utils.Format(`curl -sSL https://raw.githubusercontent.com/legendu-net/icon/main/install_icon.sh \
 			| {prefix} bash -s -- -d {dir}`, map[string]string{
diff --git a/cmd/version.go b/cmd/version.go
@@ -7,8 +7,8 @@ import (
 )
 
 // Show the version of icon.
-func version(_ *cobra.Command, args []string) {
-	fmt.Println("0.31.2")
+func version(_ *cobra.Command, _ []string) {
+	fmt.Println("0.32.0")
 }
 
 var versionCmd = &cobra.Command{
diff --git a/utils/utils.go b/utils/utils.go

Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,8 @@ func pytorch(cmd *cobra.Command, _ []string) {`
`22`	`22`	`utils.RunCmd(command)`
`23`	`23`	`}`
`24`	`24`	`if utils.GetBoolFlag(cmd, "config") {`
`25`		`- // nothing to configure`
`26`	`25`	`}`
`27`	`26`	`if utils.GetBoolFlag(cmd, "uninstall") {`
`28`		`- // TODO`
`29`	`27`	`}`
`30`	`28`	`}`
`31`	`29`
Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,7 @@ func linkArrowDbProfileFromHost() {`
`13`	`13`	`dstProfile := filepath.Join(utils.UserHomeDir(), ".arrowdb_profile")`
`14`	`14`	`if utils.ExistsFile(srcProfile) {`
`15`	`15`	`// inside a Docker container, link profile from host`
`16`		`- if utils.ExistsFile(dstProfile) {`
`17`		`- utils.RemoveAll(dstProfile)`
`18`		`- }`
`19`		`- utils.Symlink(srcProfile, dstProfile)`
	`16`	`+ utils.Symlink(srcProfile, dstProfile, false)`
`20`	`17`	`}`
`21`	`18`	`}`
`22`	`19`
Original file line number	Diff line number	Diff line change
`@@ -8,14 +8,14 @@ import (`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`// Pull data for icon from GitHub into ~/.config/icon-data.`
`11`		`-func data(cmd *cobra.Command, args []string) {`
	`11`	`+func data(cmd *cobra.Command, _ []string) {`
`12`	`12`	`dir := "~/.config/icon-data"`
`13`	`13`	`if !utils.GetBoolFlag(cmd, "force") && utils.ExistsDir(dir+"/.git") {`
`14`	`14`	`fmt.Println("Using existing data in ~/.config/icon-data.")`
`15`	`15`	`return`
`16`	`16`	`}`
`17`	`17`
`18`		`- utils.BackupDir(dir, "")`
	`18`	`+ utils.Backup(dir, "")`
`19`	`19`	`utils.MkdirAll(dir, 0o700)`
`20`	`20`
`21`	`21`	command := utils.Format(`git clone {gitUrl} {dir} \
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func installGitUi(cmd *cobra.Command) {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`func linkGitUiFiles(baseDir string) {`
`39`		`- utils.SymlinkIntoDir("~/.config/icon-data/git/gitui/key_bindings.ron", filepath.Join(baseDir, "gitui"))`
	`39`	`+ utils.SymlinkIntoDir("~/.config/icon-data/git/gitui/key_bindings.ron", filepath.Join(baseDir, "gitui"), true)`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`func configGitUi(cmd *cobra.Command) {`
`@@ -124,7 +124,7 @@ func git(cmd *cobra.Command, args []string) {`
`124`	`124`	`}`
`125`	`125`	`if utils.GetBoolFlag(cmd, "config") {`
`126`	`126`	`network.SshClient(cmd, args)`
`127`		`- utils.Symlink("~/.config/icon-data/git/gitconfig", "~/.gitconfig")`
	`127`	`+ utils.Symlink("~/.config/icon-data/git/gitconfig", "~/.gitconfig", true)`
`128`	`128`	`configGitProxy(cmd)`
`129`	`129`	`configGitUi(cmd)`
`130`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ func installGoPls(prefix string) {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`// Install and configure Golang.`
`63`		`-func golang(cmd *cobra.Command, args []string) {`
	`63`	`+func golang(cmd *cobra.Command, _ []string) {`
`64`	`64`	`prefix := utils.GetCommandPrefix(false, map[string]uint32{`
`65`	`65`	`"/usr/local/go": unix.W_OK \| unix.R_OK,`
`66`	`66`	`"/usr/local": unix.W_OK \| unix.R_OK,`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`// Install and configure pytype.`
`14`		`-func pytype(cmd *cobra.Command, args []string) {`
	`14`	`+func pytype(cmd *cobra.Command, _ []string) {`
`15`	`15`	`if utils.GetBoolFlag(cmd, "install") {`
`16`	`16`	`command := utils.Format("{pip_install} pytype", map[string]string{`
`17`	`17`	`"pip_install": utils.BuildPipInstall(cmd),`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ func installCargoBinstall() {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`// Install and configure Rust.`
`107`		`-func rust(cmd *cobra.Command, args []string) {`
	`107`	`+func rust(cmd *cobra.Command, _ []string) {`
`108`	`108`	`rustupHome := utils.GetStringFlag(cmd, "rustup-home")`
`109`	`109`	`if rustupHome == "" {`
`110`	`110`	`rustupHome = filepath.Join(utils.UserHomeDir(), ".rustup")`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`// Install and configure neovim.`
`11`		`-func neovim(cmd *cobra.Command, args []string) {`
	`11`	`+func neovim(cmd *cobra.Command, _ []string) {`
`12`	`12`	`Neovim(`
`13`	`13`	`utils.GetBoolFlag(cmd, "install"),`
`14`	`14`	`utils.GetBoolFlag(cmd, "config"),`
`@@ -58,8 +58,7 @@ func Neovim(install bool, config bool, uninstall bool, yes_s string) {`
`58`	`58`	`}`
`59`	`59`	`if config {`
`60`	`60`	`dir := "~/.config/nvim"`
`61`		`- utils.BackupDir(dir, "")`
`62`		`- utils.Symlink("~/.config/icon-data/nvim", dir)`
	`61`	`+ utils.Symlink("~/.config/icon-data/nvim", dir, true)`
`63`	`62`	`}`
`64`	`63`	`if uninstall {`
`65`	`64`	`switch runtime.GOOS {`