Merge pull request #147 from legendu-net/symlink

dclong · web-flow · commit 909d79d92433 · 2025-12-08T22:09:42.000-08:00
Symlink
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/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
@@ -15,7 +15,7 @@ func data(cmd *cobra.Command, args []string) {
 		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/ide/neovim.go b/cmd/ide/neovim.go
@@ -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
@@ -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/ipython.go b/cmd/jupyter/ipython.go
@@ -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/network/ssh_client.go b/cmd/network/ssh_client.go
@@ -38,7 +38,7 @@ func SshClient(cmd *cobra.Command, args []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/shell/bash_it.go b/cmd/shell/bash_it.go
@@ -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
@@ -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
@@ -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/utils/utils.go b/utils/utils.go
@@ -1501,18 +1501,24 @@ func IsSocket(path string) bool {
 // @example
 //
 //	Symlink("/path/to/source/file.txt", "/path/to/link/file.txt")
-func Symlink(path string, dstLink string) {
+func Symlink(path string, dstLink string, backup bool) {
 	path = NormalizePath(path)
 	dstLink = NormalizePath(dstLink)
+	if backup {
+		Backup(dstLink, "")
+	} else {
+		RemoveAll(dstLink)
+	}
+
 	MkdirAll(filepath.Dir(dstLink), 0o700)
 	err := os.Symlink(path, dstLink)
 	if err != nil {
 		log.Fatalf("Failed to link the file %s to %s!\n", path, dstLink)
 	}
 }
 
-func SymlinkIntoDir(path string, dstDir string) {
-	Symlink(path, filepath.Join(dstDir, filepath.Base(path)))
+func SymlinkIntoDir(path string, dstDir string, backup bool) {
+	Symlink(path, filepath.Join(dstDir, filepath.Base(path)), backup)
 }
 
 // Update map1 using map2.
@@ -1665,21 +1671,21 @@ func ParseInt(str string) int64 {
 	return i
 }
 
-func RenameDir(originalDir string, newDir string) {
-	err := os.Rename(originalDir, newDir)
+func Rename(original string, new string) {
+	err := os.Rename(original, new)
 	if err != nil {
 		log.Fatal(err)
 	}
 }
 
-func BackupDir(originalDir string, backupDir string) {
-	originalDir = NormalizePath(originalDir)
-	backupDir = NormalizePath(backupDir)
-	if ExistsDir(originalDir) {
-		if backupDir == "" {
-			backupDir = filepath.Clean(originalDir) + "_" + time.Now().Format(time.RFC3339)
+func Backup(original string, backup string) {
+	original = NormalizePath(original)
+	backup = NormalizePath(backup)
+	if ExistsDir(original) {
+		if backup == "" {
+			backup = filepath.Clean(original) + "_" + time.Now().Format(time.RFC3339)
 		}
-		RenameDir(originalDir, backupDir)
-		fmt.Printf("%s has been backed up to %s.\n", originalDir, backupDir)
+		Rename(original, backup)
+		fmt.Printf("%s has been backed up to %s.\n", original, backup)
 	}
 }

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
`@@ -15,7 +15,7 @@ func data(cmd *cobra.Command, args []string) {`
`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
`@@ -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 {`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func vscode(cmd *cobra.Command, args []string) {`
`52`	`52`	`if utils.GetBoolFlag(cmd, "copy") {`
`53`	`53`	`utils.CopyFileToDir("~/.config/icon-data/vscode/settings.json", userDir)`
`54`	`54`	`} else {`
`55`		`- utils.SymlinkIntoDir("~/.config/icon-data/vscode/settings.json", userDir)`
	`55`	`+ utils.SymlinkIntoDir("~/.config/icon-data/vscode/settings.json", userDir, true)`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`if utils.GetBoolFlag(cmd, "uninstall") {`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ func SshClient(cmd *cobra.Command, args []string) {`
`38`	`38`	`if utils.GetBoolFlag(cmd, "install") {`
`39`	`39`	`}`
`40`	`40`	`if utils.GetBoolFlag(cmd, "config") {`
`41`		`- utils.SymlinkIntoDir("~/.config/icon-data/ssh/client/config", sshHome)`
	`41`	`+ utils.SymlinkIntoDir("~/.config/icon-data/ssh/client/config", sshHome, true)`
`42`	`42`	`copySshcSettingsFromHost()`
`43`	`43`	`utils.MkdirAll(filepath.Join(sshHome, "control"), 0o700)`
`44`	`44`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ func bashIt(cmd *cobra.Command, args []string) {`
`23`	`23`	`}`
`24`	`24`	`if utils.GetBoolFlag(cmd, "config") {`
`25`	`25`	`utils.ConfigBash()`
`26`		`- utils.Symlink("~/.config/icon-data/bash-it", "~/.bash_it")`
	`26`	`+ utils.Symlink("~/.config/icon-data/bash-it", "~/.bash_it", true)`
`27`	`27`	`}`
`28`	`28`	`if utils.GetBoolFlag(cmd, "uninstall") {`
`29`	`29`	`utils.RunCmd("~/.bash_it/uninstall.sh && rm -rf ~/.bash_it/")`
Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,7 @@ func fish(cmd *cobra.Command, args []string) {`
`92`	`92`	`}`
`93`	`93`	`if utils.GetBoolFlag(cmd, "config") {`
`94`	`94`	`dir := "~/.config/fish"`
`95`		`- utils.BackupDir(dir, "")`
`96`		`- utils.Symlink("~/.config/icon-data/fish", dir)`
	`95`	`+ utils.Symlink("~/.config/icon-data/fish", dir, true)`
`97`	`96`
`98`	`97`	`generateCompletions()`
`99`	`98`	`generateCrazyCompletions()`