Skip to content

fix: fixed the path local issue in script #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vvyas123 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: fixed the path local issue in script #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 34 additions & 9 deletions install-gitleaks-global.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,23 @@ NC='\033[0m' # No Color

# Function to run gitleaks scan
run_gitleaks_scan() {
# Check if gitleaks is installed
if ! command -v gitleaks &> /dev/null; then
echo -e "${RED}Error: gitleaks is not installed${NC}"
# Add common gitleaks installation paths to PATH
export PATH="/usr/local/bin:/opt/homebrew/bin:/usr/bin:/bin:$PATH"

# Try to find gitleaks executable
GITLEAKS_BIN=""
for gitleaks_path in /usr/local/bin/gitleaks /opt/homebrew/bin/gitleaks /usr/bin/gitleaks $(which gitleaks 2>/dev/null); do
if [ -x "$gitleaks_path" ] 2>/dev/null; then
GITLEAKS_BIN="$gitleaks_path"
break
fi
done

if [ -z "$GITLEAKS_BIN" ]; then
echo -e "${RED}Error: gitleaks is not installed or not found in PATH${NC}"
echo "Install it from: https://github.com/gitleaks/gitleaks"
echo "Or run: brew install gitleaks (macOS) or go install github.com/gitleaks/gitleaks/v8@latest"
echo "Searched paths: /usr/local/bin, /opt/homebrew/bin, /usr/bin"
return 1
fi

Expand All @@ -131,11 +143,12 @@ run_gitleaks_scan() {

# Run gitleaks on staged changes
echo -e "${YELLOW}🔍 Scanning for secrets with gitleaks...${NC}"
echo -e "${YELLOW}Using: $GITLEAKS_BIN${NC}"

if [ -n "$GITLEAKS_CONFIG" ]; then
gitleaks protect --staged --redact --config="$GITLEAKS_CONFIG" --verbose
"$GITLEAKS_BIN" protect --staged --redact --config="$GITLEAKS_CONFIG" --verbose
else
gitleaks protect --staged --redact --verbose
"$GITLEAKS_BIN" protect --staged --redact --verbose
fi

if [ $? -eq 0 ]; then
Expand Down Expand Up @@ -174,8 +187,20 @@ cat > "$TEMPLATE_DIR/hooks/commit-msg" << 'EOF'
# Gitleaks commit-msg hook (Smart Auto-Detecting)
# This is a secondary check in case pre-commit was bypassed

# Skip if gitleaks not installed
if ! command -v gitleaks &> /dev/null; then
# Add common gitleaks installation paths to PATH
export PATH="/usr/local/bin:/opt/homebrew/bin:/usr/bin:/bin:$PATH"

# Find gitleaks executable
GITLEAKS_BIN=""
for gitleaks_path in /usr/local/bin/gitleaks /opt/homebrew/bin/gitleaks /usr/bin/gitleaks; do
if [ -x "$gitleaks_path" ] 2>/dev/null; then
GITLEAKS_BIN="$gitleaks_path"
break
fi
done

# Skip if gitleaks not found
if [ -z "$GITLEAKS_BIN" ]; then
exit 0
fi

Expand All @@ -195,9 +220,9 @@ fi

# Silent check on commit
if [ -n "$GITLEAKS_CONFIG" ]; then
gitleaks protect --staged --redact --config="$GITLEAKS_CONFIG" > /dev/null 2>&1
"$GITLEAKS_BIN" protect --staged --redact --config="$GITLEAKS_CONFIG" > /dev/null 2>&1
else
gitleaks protect --staged --redact > /dev/null 2>&1
"$GITLEAKS_BIN" protect --staged --redact > /dev/null 2>&1
fi

if [ $? -ne 0 ]; then
Expand Down
64 changes: 51 additions & 13 deletions update-all-repos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,19 +98,29 @@ function inject_gitleaks_husky {

# Gitleaks secret scanning (auto-injected by gitleaks)
# Add common gitleaks installation paths to PATH for Husky non-login shell
export PATH="/usr/local/bin:/opt/homebrew/bin:$PATH"
export PATH="/usr/local/bin:/opt/homebrew/bin:/usr/bin:/bin:$PATH"

if command -v gitleaks &> /dev/null; then
# Try to find gitleaks
GITLEAKS_BIN=""
for gitleaks_path in /usr/local/bin/gitleaks /opt/homebrew/bin/gitleaks /usr/bin/gitleaks $(which gitleaks 2>/dev/null); do
if [ -x "$gitleaks_path" ] 2>/dev/null; then
GITLEAKS_BIN="$gitleaks_path"
break
fi
done

if [ -n "$GITLEAKS_BIN" ]; then
echo "🔍 Scanning for secrets with gitleaks..."
GITLEAKS_CONFIG="$HOME/.config/gitleaks/gitleaks.toml"
if [ -f "$GITLEAKS_CONFIG" ]; then
gitleaks protect --staged --redact --verbose --config="$GITLEAKS_CONFIG" || exit 1
"$GITLEAKS_BIN" protect --staged --redact --verbose --config="$GITLEAKS_CONFIG" || exit 1
else
gitleaks protect --staged --redact --verbose || exit 1
"$GITLEAKS_BIN" protect --staged --redact --verbose || exit 1
fi
echo "✓ No secrets detected"
else
echo "⚠ Warning: gitleaks not found, skipping secret scan"
echo "⚠ Warning: gitleaks not found in PATH, skipping secret scan"
echo " Searched: /usr/local/bin, /opt/homebrew/bin, /usr/bin"
fi
GITLEAKS_INJECT
injected=true
Expand All @@ -122,17 +132,30 @@ GITLEAKS_INJECT
cat >> "$temp_file" << 'GITLEAKS_INJECT'

# Gitleaks secret scanning (auto-injected by gitleaks)
if command -v gitleaks &> /dev/null; then
# Add common gitleaks installation paths to PATH for Husky non-login shell
export PATH="/usr/local/bin:/opt/homebrew/bin:/usr/bin:/bin:$PATH"

# Try to find gitleaks
GITLEAKS_BIN=""
for gitleaks_path in /usr/local/bin/gitleaks /opt/homebrew/bin/gitleaks /usr/bin/gitleaks $(which gitleaks 2>/dev/null); do
if [ -x "$gitleaks_path" ] 2>/dev/null; then
GITLEAKS_BIN="$gitleaks_path"
break
fi
done

if [ -n "$GITLEAKS_BIN" ]; then
echo "🔍 Scanning for secrets with gitleaks..."
GITLEAKS_CONFIG="$HOME/.config/gitleaks/gitleaks.toml"
if [ -f "$GITLEAKS_CONFIG" ]; then
gitleaks protect --staged --redact --verbose --config="$GITLEAKS_CONFIG" || exit 1
"$GITLEAKS_BIN" protect --staged --redact --verbose --config="$GITLEAKS_CONFIG" || exit 1
else
gitleaks protect --staged --redact --verbose || exit 1
"$GITLEAKS_BIN" protect --staged --redact --verbose || exit 1
fi
echo "✓ No secrets detected"
else
echo "⚠ Warning: gitleaks not found, skipping secret scan"
echo "⚠ Warning: gitleaks not found in PATH, skipping secret scan"
echo " Searched: /usr/local/bin, /opt/homebrew/bin, /usr/bin"
fi
GITLEAKS_INJECT
fi
Expand Down Expand Up @@ -163,18 +186,33 @@ function create_husky_precommit {
}

cat > "$hook_file" << 'HUSKY_HOOK'
#!/bin/sh

# Gitleaks secret scanning (auto-injected by gitleaks)
if command -v gitleaks &> /dev/null; then
# Add common gitleaks installation paths to PATH for Husky non-login shell
export PATH="/usr/local/bin:/opt/homebrew/bin:/usr/bin:/bin:$PATH"

# Try to find gitleaks
GITLEAKS_BIN=""
for gitleaks_path in /usr/local/bin/gitleaks /opt/homebrew/bin/gitleaks /usr/bin/gitleaks $(which gitleaks 2>/dev/null); do
if [ -x "$gitleaks_path" ] 2>/dev/null; then
GITLEAKS_BIN="$gitleaks_path"
break
fi
done

if [ -n "$GITLEAKS_BIN" ]; then
echo "🔍 Scanning for secrets with gitleaks..."
GITLEAKS_CONFIG="$HOME/.config/gitleaks/gitleaks.toml"
if [ -f "$GITLEAKS_CONFIG" ]; then
gitleaks protect --staged --redact --verbose --config="$GITLEAKS_CONFIG" || exit 1
"$GITLEAKS_BIN" protect --staged --redact --verbose --config="$GITLEAKS_CONFIG" || exit 1
else
gitleaks protect --staged --redact --verbose || exit 1
"$GITLEAKS_BIN" protect --staged --redact --verbose || exit 1
fi
echo "✓ No secrets detected"
else
echo "⚠ Warning: gitleaks not found, skipping secret scan"
echo "⚠ Warning: gitleaks not found in PATH, skipping secret scan"
echo " Searched: /usr/local/bin, /opt/homebrew/bin, /usr/bin"
fi
HUSKY_HOOK

Expand Down
Loading