Merge pull request #400 from x-stp/chore/tiny-bumps

feat: add fish shell support and upgrade to Go 1.24.2

Author: dogancanbakir

.github/workflows/build-test.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21.x
+          go-version: 1.24.x
 
       - name: Check out code
         uses: actions/checkout@v3

.github/workflows/release-binary.yml

@@ -18,7 +18,7 @@ jobs:
       - name: "Set up Go"
         uses: actions/setup-go@v4
         with: 
-          go-version: 1.21.x
+          go-version: 1.24.x
           check-latest: true
           cache: true
 

.github/workflows/release-test.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21.x
+          go-version: 1.24.x
 
       - name: release test
         uses: goreleaser/goreleaser-action@v4

.github/workflows/setup-test.yaml

@@ -21,7 +21,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21.x
+          go-version: 1.24.x
 
       - name: Check out code
         uses: actions/checkout@v3

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.20.6-alpine AS builder
+FROM golang:1.24.2-alpine AS builder
 RUN apk add --no-cache git
 RUN go install -v github.com/projectdiscovery/pdtm/cmd/pdtm@latest
 

README.md

@@ -31,7 +31,7 @@
 ## Installation
 
 
-**`pdtm`** requires **go1.19** to install successfully. Run the following command to install the latest version:
+**`pdtm`** requires **go1.24.2** to install successfully. Run the following command to install the latest version:
 
 1. Install using go install -
 

internal/runner/banner.go

@@ -5,7 +5,7 @@ import (
 	updateutils "github.com/projectdiscovery/utils/update"
 )
 
-const version = "v0.0.9"
+const version = "v0.0.10"
 
 var banner = `
                 ____          

pkg/path/unix.go

@@ -24,6 +24,10 @@ var confList = []*Config{
 		shellName: "zsh",
 		rcFile:    ".zshrc",
 	},
+	{
+		shellName: "fish",
+		rcFile:    ".config/fish/config.fish",
+	},
 }
 
 func (c *Config) GetRCFilePath() (string, error) {
@@ -32,6 +36,17 @@ func (c *Config) GetRCFilePath() (string, error) {
 		return "", err
 	}
 	rcFilePath := filepath.Join(home, c.rcFile)
+
+	// For fish, ensure the directory exists
+	if c.shellName == "fish" {
+		configDir := filepath.Dir(rcFilePath)
+		if !fileutil.FolderExists(configDir) {
+			if err := os.MkdirAll(configDir, os.ModePerm); err != nil {
+				return "", fmt.Errorf("failed to create fish config directory %v got %v", configDir, err)
+			}
+		}
+	}
+
 	if fileutil.FileExists(rcFilePath) {
 		return rcFilePath, nil
 	}
@@ -79,7 +94,13 @@ func add(path string) (bool, error) {
 		return false, errorutil.NewWithErr(err).Msgf("add %s to $PATH env", path)
 	}
 
-	script := fmt.Sprintf("export PATH=$PATH:%s\n\n", path)
+	var script string
+	if conf.shellName == "fish" {
+		script = fmt.Sprintf("fish_add_path %s\n\n", path)
+	} else {
+		script = fmt.Sprintf("export PATH=$PATH:%s\n\n", path)
+	}
+
 	return exportToConfig(conf, path, script)
 }
 
@@ -93,8 +114,15 @@ func remove(path string) (bool, error) {
 	if err != nil {
 		return false, errorutil.NewWithErr(err).Msgf("remove %s from $PATH env", path)
 	}
-	pathVars = sliceutil.PruneEqual(pathVars, path)
-	script := fmt.Sprintf("export PATH=%s\n\n", strings.Join(pathVars, ":"))
+
+	var script string
+	if conf.shellName == "fish" {
+		script = fmt.Sprintf("set --erase fish_user_paths[contains $fish_user_paths %s]\n\n", path)
+	} else {
+		pathVars = sliceutil.PruneEqual(pathVars, path)
+		script = fmt.Sprintf("export PATH=%s\n\n", strings.Join(pathVars, ":"))
+	}
+
 	return exportToConfig(conf, path, script)
 }
 
@@ -115,21 +143,31 @@ func exportToConfig(config *Config, path, script string) (bool, error) {
 	lines := strings.Split(strings.TrimSpace(string(b)), "\n")
 	for _, line := range lines {
 		if strings.EqualFold(line, strings.TrimSpace(script)) {
-			gologger.Info().Msgf("Run `source ~/%s` to add %s to $PATH ", config.rcFile, path)
+			if config.shellName == "fish" {
+				gologger.Info().Msgf("Run `source %s` to add %s to $PATH ", rcFilePath, path)
+			} else {
+				gologger.Info().Msgf("Run `source ~/%s` to add %s to $PATH ", config.rcFile, path)
+			}
 			return true, nil
 		}
 	}
 	f, err := os.OpenFile(rcFilePath, os.O_APPEND|os.O_WRONLY, 0644)
 	if err != nil {
 		return false, err
 	}
+
 	script = fmt.Sprintf("\n\n# Generated for pdtm. Do not edit.\n%s", script)
 	if _, err := f.Write([]byte(script)); err != nil {
 		return false, err
 	}
 	if err := f.Close(); err != nil {
 		return false, err
 	}
-	gologger.Info().Label("WRN").Msgf("Run `source ~/%s` to add $PATH (%s)", config.rcFile, path)
+
+	if config.shellName == "fish" {
+		gologger.Info().Label("WRN").Msgf("Run `source %s` to add $PATH (%s)", rcFilePath, path)
+	} else {
+		gologger.Info().Label("WRN").Msgf("Run `source ~/%s` to add $PATH (%s)", config.rcFile, path)
+	}
 	return true, nil
 }