Add/rm from git when add/removing files from repositories

andornaut · Nov 14, 2021 · 47f08ea · 47f08ea
1 parent 8ed2de0
commit 47f08ea
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/internal/link/link.go b/internal/link/link.go
@@ -10,6 +10,7 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/andornaut/gog/internal/git"
 	"github.com/andornaut/gog/internal/repository"
 )
 
@@ -109,6 +110,7 @@ func File(repoPath, intPath string) error {
 	if err == nil {
 		// Success
 		printLinked(intPath, extPath)
+		addToGit(repoPath, intPath, extPath)
 		return nil
 	}
 	if !os.IsExist(err) {
@@ -122,7 +124,7 @@ func File(repoPath, intPath string) error {
 		return nil
 	}
 	if extFileInfo.IsDir() {
-		printError(intPath, fmt.Errorf("path expected to be a file, but is a directory: %s", extPath))
+		printError(intPath, fmt.Errorf("path is expected to be a file, but is a directory: %s", extPath))
 		return nil
 	}
 
@@ -139,6 +141,7 @@ func File(repoPath, intPath string) error {
 
 	if actualExtPath == intPath {
 		// Already linked
+		addToGit(repoPath, intPath, extPath)
 		return nil
 	}
 
@@ -154,15 +157,21 @@ func File(repoPath, intPath string) error {
 			return nil
 		}
 	}
-
 	if err = os.Symlink(intPath, extPath); err != nil {
 		printError(intPath, err)
 		return nil
 	}
 	printLinked(intPath, extPath)
+	addToGit(repoPath, intPath, extPath)
 	return nil
 }
 
+func addToGit(repoPath, intPath, extPath string) {
+	if err := git.Run(repoPath, "add", intPath); err != nil {
+		printError(intPath, err)
+	}
+}
+
 func backup(p string) bool {
 	backupPath := backupPath(p)
 	if err := os.Rename(p, backupPath); err != nil {

diff --git a/internal/link/print.go b/internal/link/print.go
@@ -15,7 +15,7 @@ func printLinked(intPath string, extPath string) {
 }
 
 func printUnLinked(intPath string, extPath string) {
-	fmt.Printf("%s -> %s\n", escapeHomeVar(intPath), extPath)
+	fmt.Printf("Removed: %s\n", escapeHomeVar(intPath))
 }
 
 func escapeHomeVar(p string) string {

diff --git a/internal/link/unlink.go b/internal/link/unlink.go
@@ -5,6 +5,7 @@ import (
 	"path/filepath"
 
 	"github.com/andornaut/gog/internal/copy"
+	"github.com/andornaut/gog/internal/git"
 	"github.com/andornaut/gog/internal/repository"
 )
 
@@ -47,5 +48,5 @@ func UnlinkFile(repoPath, intPath string) error {
 		return err
 	}
 	printUnLinked(intPath, extPath)
-	return nil
+	return git.Run(repoPath, "rm", "-qf", intPath)
 }