refactor: decompose ensure_jq and ensure_gh_cli into focused helpers#994

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

Merged
louisgv merged 1 commit into from
Feb 13, 2026
Merged

refactor: decompose ensure_jq and ensure_gh_cli into focused helpers #994

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
66 changes: 48 additions & 18 deletions shared/common.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -113,6 +113,49 @@ check_python_available() {
}

# Install jq if not already present (required by some cloud providers)
# Platform-specific jq install helpers
_install_jq_brew() {
if command -v brew &>/dev/null; then
brew install jq || { log_error "Failed to install jq via Homebrew. Run 'brew install jq' manually."; return 1; }
else
log_error "jq is required but not installed"
log_error "Install it with: brew install jq"
log_error "If Homebrew is not available: https://jqlang.github.io/jq/download/"
return 1
fi
}

_install_jq_apt() {
sudo apt-get update -qq && sudo apt-get install -y jq || {
log_error "Failed to install jq via apt. Run 'sudo apt-get install -y jq' manually."
return 1
}
}

_install_jq_dnf() {
sudo dnf install -y jq || {
log_error "Failed to install jq via dnf. Run 'sudo dnf install -y jq' manually."
return 1
}
}

_install_jq_apk() {
sudo apk add jq || {
log_error "Failed to install jq via apk. Run 'sudo apk add jq' manually."
return 1
}
}

_report_jq_not_found() {
log_error "jq is required but not installed"
log_error ""
log_error "Install jq for your system:"
log_error " Ubuntu/Debian: sudo apt-get install -y jq"
log_error " Fedora/RHEL: sudo dnf install -y jq"
log_error " macOS: brew install jq"
log_error " Other: https://jqlang.github.io/jq/download/"
}

ensure_jq() {
if command -v jq &>/dev/null; then
return 0
Expand All@@ -121,28 +164,15 @@ ensure_jq() {
log_step "Installing jq..."

if [[ "$OSTYPE" == "darwin"* ]]; then
if command -v brew &>/dev/null; then
brew install jq || { log_error "Failed to install jq via Homebrew. Run 'brew install jq' manually."; return 1; }
else
log_error "jq is required but not installed"
log_error "Install it with: brew install jq"
log_error "If Homebrew is not available: https://jqlang.github.io/jq/download/"
return 1
fi
_install_jq_brew || return 1
elif command -v apt-get &>/dev/null; then
sudo apt-get update -qq && sudo apt-get install -y jq || { log_error "Failed to install jq via apt. Run 'sudo apt-get install -y jq' manually."; return 1; }
_install_jq_apt || return 1
elif command -v dnf &>/dev/null; then
sudo dnf install -y jq || { log_error "Failed to install jq via dnf. Run 'sudo dnf install -y jq' manually."; return 1; }
_install_jq_dnf || return 1
elif command -v apk &>/dev/null; then
sudo apk add jq || { log_error "Failed to install jq via apk. Run 'sudo apk add jq' manually."; return 1; }
_install_jq_apk || return 1
else
log_error "jq is required but not installed"
log_error ""
log_error "Install jq for your system:"
log_error " Ubuntu/Debian: sudo apt-get install -y jq"
log_error " Fedora/RHEL: sudo dnf install -y jq"
log_error " macOS: brew install jq"
log_error " Other: https://jqlang.github.io/jq/download/"
_report_jq_not_found
return 1
fi

Expand Down
115 changes: 75 additions & 40 deletions shared/github-auth.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,44 @@ fi
# ensure_gh_cli — Install gh CLI if not already present
# ============================================================

# Install gh via Homebrew (macOS)
_install_gh_brew() {
if command -v brew &>/dev/null; then
brew install gh || {
log_error "Failed to install gh via Homebrew"
return 1
}
else
log_error "Homebrew not found. Install Homebrew first: https://brew.sh"
log_error "Then run: brew install gh"
return 1
fi
}

# Install gh via APT with GitHub's official repository (Debian/Ubuntu)
_install_gh_apt() {
log_step "Adding GitHub CLI APT repository..."
curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
| sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg 2>/dev/null
sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg
printf 'deb [arch=%s signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\n' \
"$(dpkg --print-architecture)" \
| sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
sudo apt-get update -qq
sudo apt-get install -y gh || {
log_error "Failed to install gh via apt"
return 1
}
}

# Install gh via DNF (Fedora/RHEL)
_install_gh_dnf() {
sudo dnf install -y gh || {
log_error "Failed to install gh via dnf"
return 1
}
}

ensure_gh_cli() {
if command -v gh &>/dev/null; then
log_info "GitHub CLI (gh) available: $(gh --version | head -1)"
Expand All@@ -42,44 +80,16 @@ ensure_gh_cli() {
log_step "Installing GitHub CLI (gh)..."

if [[ "$OSTYPE" == "darwin"* ]]; then
# macOS — require Homebrew
if command -v brew &>/dev/null; then
brew install gh || {
log_error "Failed to install gh via Homebrew"
return 1
}
else
log_error "Homebrew not found. Install Homebrew first: https://brew.sh"
log_error "Then run: brew install gh"
return 1
fi
_install_gh_brew || return 1
elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
if command -v apt-get &>/dev/null; then
# Debian/Ubuntu — add GitHub's official APT repo
log_step "Adding GitHub CLI APT repository..."
curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
| sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg 2>/dev/null
sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg
printf 'deb [arch=%s signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\n' \
"$(dpkg --print-architecture)" \
| sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
sudo apt-get update -qq
sudo apt-get install -y gh || {
log_error "Failed to install gh via apt"
return 1
}
_install_gh_apt || return 1
elif command -v dnf &>/dev/null; then
# Fedora/RHEL
sudo dnf install -y gh || {
log_error "Failed to install gh via dnf"
return 1
}
_install_gh_dnf || return 1
else
# Fallback — download prebuilt binary
_install_gh_binary || return 1
fi
else
# Unknown OS — try binary fallback
_install_gh_binary || return 1
fi

Expand All@@ -95,9 +105,9 @@ ensure_gh_cli() {
# Binary fallback installer (non-apt/non-brew systems)
# ============================================================

_install_gh_binary() {
log_step "Installing gh from GitHub releases (binary fallback)..."

# Detect OS and architecture for binary downloads, outputting "os arch" on stdout.
# Returns 1 with error message if platform is unsupported.
_detect_gh_platform() {
local os arch gh_os gh_arch
os="$(uname -s)"
arch="$(uname -m)"
Expand All@@ -120,7 +130,11 @@ _install_gh_binary() {
;;
esac

# Get latest release version
echo "${gh_os} ${gh_arch}"
}

# Fetch the latest gh release version string from GitHub API
_fetch_gh_latest_version() {
local latest_version
latest_version=$(curl -fsSL "https://api.github.com/repos/cli/cli/releases/latest" \
| grep '"tag_name"' | sed 's/.*"v\([^"]*\)".*/\1/') || {
Expand All@@ -133,10 +147,18 @@ _install_gh_binary() {
return 1
fi

log_step "Downloading gh v${latest_version} for ${gh_os}/${gh_arch}..."
echo "${latest_version}"
}

# Download and extract a gh release tarball into ~/.local/bin
# Usage: _download_and_install_gh VERSION GH_OS GH_ARCH
_download_and_install_gh() {
local version="${1}" gh_os="${2}" gh_arch="${3}"

log_step "Downloading gh v${version} for ${gh_os}/${gh_arch}..."

local tarball="gh_${latest_version}_${gh_os}_${gh_arch}.tar.gz"
local url="https://github.com/cli/cli/releases/download/v${latest_version}/${tarball}"
local tarball="gh_${version}_${gh_os}_${gh_arch}.tar.gz"
local url="https://github.com/cli/cli/releases/download/v${version}/${tarball}"
local tmpdir
tmpdir=$(mktemp -d)

Expand All@@ -152,9 +174,8 @@ _install_gh_binary() {
return 1
}

# Install to ~/.local/bin
mkdir -p "${HOME}/.local/bin"
cp "${tmpdir}/gh_${latest_version}_${gh_os}_${gh_arch}/bin/gh" "${HOME}/.local/bin/gh"
cp "${tmpdir}/gh_${version}_${gh_os}_${gh_arch}/bin/gh" "${HOME}/.local/bin/gh"
chmod +x "${HOME}/.local/bin/gh"
rm -rf "${tmpdir}"

Expand All@@ -167,6 +188,20 @@ _install_gh_binary() {
log_info "gh installed to ${HOME}/.local/bin/gh"
}

_install_gh_binary() {
log_step "Installing gh from GitHub releases (binary fallback)..."

local platform
platform=$(_detect_gh_platform) || return 1
local gh_os gh_arch
read -r gh_os gh_arch <<< "${platform}"

local latest_version
latest_version=$(_fetch_gh_latest_version) || return 1

_download_and_install_gh "${latest_version}" "${gh_os}" "${gh_arch}"
}

# ============================================================
# ensure_gh_auth — Authenticate with GitHub via gh auth login
# ============================================================
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
refactor: decompose ensure_jq and ensure_gh_cli into focused helpers#994

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

 Merged

louisgv
merged 1 commit into

from

Feb 13, 2026
 Merged


refactor: decompose ensure_jq and ensure_gh_cli into focused helpers
#994
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


66 changes: 48 additions & 18 deletions
shared/common.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,6 +113,49 @@ check_python_available() {
}

# Install jq if not already present (required by some cloud providers)
# Platform-specific jq install helpers
_install_jq_brew() {
 if command -v brew &>/dev/null; then
 brew install jq || { log_error "Failed to install jq via Homebrew. Run 'brew install jq' manually."; return 1; }
 else
 log_error "jq is required but not installed"
 log_error "Install it with: brew install jq"
 log_error "If Homebrew is not available: https://jqlang.github.io/jq/download/"
 return 1
 fi
}

_install_jq_apt() {
 sudo apt-get update -qq && sudo apt-get install -y jq || {
 log_error "Failed to install jq via apt. Run 'sudo apt-get install -y jq' manually."
 return 1
 }
}

_install_jq_dnf() {
 sudo dnf install -y jq || {
 log_error "Failed to install jq via dnf. Run 'sudo dnf install -y jq' manually."
 return 1
 }
}

_install_jq_apk() {
 sudo apk add jq || {
 log_error "Failed to install jq via apk. Run 'sudo apk add jq' manually."
 return 1
 }
}

_report_jq_not_found() {
 log_error "jq is required but not installed"
 log_error ""
 log_error "Install jq for your system:"
 log_error " Ubuntu/Debian: sudo apt-get install -y jq"
 log_error " Fedora/RHEL: sudo dnf install -y jq"
 log_error " macOS: brew install jq"
 log_error " Other: https://jqlang.github.io/jq/download/"
}

ensure_jq() {
 if command -v jq &>/dev/null; then
 return 0
Expand All@@ -121,28 +164,15 @@ ensure_jq() {
 log_step "Installing jq..."

 if [[ "$OSTYPE" == "darwin"* ]]; then
 if command -v brew &>/dev/null; then
 brew install jq || { log_error "Failed to install jq via Homebrew. Run 'brew install jq' manually."; return 1; }
 else
 log_error "jq is required but not installed"
 log_error "Install it with: brew install jq"
 log_error "If Homebrew is not available: https://jqlang.github.io/jq/download/"
 return 1
 fi
 _install_jq_brew || return 1
 elif command -v apt-get &>/dev/null; then
sudo apt-get update -qq && sudo apt-get install -y jq || { log_error "Failed to install jq via apt. Run 'sudo apt-get install -y jq' manually."; return 1; }
_install_jq_apt || return 1
 elif command -v dnf &>/dev/null; then
sudo dnf install -y jq || { log_error "Failed to install jq via dnf. Run 'sudo dnf install -y jq' manually."; return 1; }
_install_jq_dnf || return 1
 elif command -v apk &>/dev/null; then
sudo apk add jq || { log_error "Failed to install jq via apk. Run 'sudo apk add jq' manually."; return 1; }
_install_jq_apk || return 1
 else
 log_error "jq is required but not installed"
 log_error ""
 log_error "Install jq for your system:"
 log_error " Ubuntu/Debian: sudo apt-get install -y jq"
 log_error " Fedora/RHEL: sudo dnf install -y jq"
 log_error " macOS: brew install jq"
 log_error " Other: https://jqlang.github.io/jq/download/"
 _report_jq_not_found
 return 1
 fi

Expand Down

115 changes: 75 additions & 40 deletions
shared/github-auth.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,44 @@ fi
# ensure_gh_cli — Install gh CLI if not already present
# ============================================================

# Install gh via Homebrew (macOS)
_install_gh_brew() {
 if command -v brew &>/dev/null; then
 brew install gh || {
 log_error "Failed to install gh via Homebrew"
 return 1
 }
 else
 log_error "Homebrew not found. Install Homebrew first: https://brew.sh"
 log_error "Then run: brew install gh"
 return 1
 fi
}

# Install gh via APT with GitHub's official repository (Debian/Ubuntu)
_install_gh_apt() {
 log_step "Adding GitHub CLI APT repository..."
 curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
 | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg 2>/dev/null
 sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg
 printf 'deb [arch=%s signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\n' \
 "$(dpkg --print-architecture)" \
 | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
 sudo apt-get update -qq
 sudo apt-get install -y gh || {
 log_error "Failed to install gh via apt"
 return 1
 }
}

# Install gh via DNF (Fedora/RHEL)
_install_gh_dnf() {
 sudo dnf install -y gh || {
 log_error "Failed to install gh via dnf"
 return 1
 }
}

ensure_gh_cli() {
 if command -v gh &>/dev/null; then
 log_info "GitHub CLI (gh) available: $(gh --version | head -1)"
Expand All@@ -42,44 +80,16 @@ ensure_gh_cli() {
 log_step "Installing GitHub CLI (gh)..."

 if [[ "$OSTYPE" == "darwin"* ]]; then
 # macOS — require Homebrew
 if command -v brew &>/dev/null; then
 brew install gh || {
 log_error "Failed to install gh via Homebrew"
 return 1
 }
 else
 log_error "Homebrew not found. Install Homebrew first: https://brew.sh"
 log_error "Then run: brew install gh"
 return 1
 fi
 _install_gh_brew || return 1
 elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
 if command -v apt-get &>/dev/null; then
 # Debian/Ubuntu — add GitHub's official APT repo
 log_step "Adding GitHub CLI APT repository..."
 curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
 | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg 2>/dev/null
 sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg
 printf 'deb [arch=%s signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\n' \
 "$(dpkg --print-architecture)" \
 | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
 sudo apt-get update -qq
 sudo apt-get install -y gh || {
 log_error "Failed to install gh via apt"
 return 1
 }
 _install_gh_apt || return 1
 elif command -v dnf &>/dev/null; then
 # Fedora/RHEL
 sudo dnf install -y gh || {
 log_error "Failed to install gh via dnf"
 return 1
 }
 _install_gh_dnf || return 1
 else
 # Fallback — download prebuilt binary
 _install_gh_binary || return 1
 fi
 else
 # Unknown OS — try binary fallback
 _install_gh_binary || return 1
 fi

Expand All@@ -95,9 +105,9 @@ ensure_gh_cli() {
# Binary fallback installer (non-apt/non-brew systems)
# ============================================================

_install_gh_binary() {
 log_step "Installing gh from GitHub releases (binary fallback)..."

# Detect OS and architecture for binary downloads, outputting "os arch" on stdout.
# Returns 1 with error message if platform is unsupported.
_detect_gh_platform() {
 local os arch gh_os gh_arch
 os="$(uname -s)"
 arch="$(uname -m)"
Expand All@@ -120,7 +130,11 @@ _install_gh_binary() {
 ;;
 esac

 # Get latest release version
 echo "${gh_os} ${gh_arch}"
}

# Fetch the latest gh release version string from GitHub API
_fetch_gh_latest_version() {
 local latest_version
 latest_version=$(curl -fsSL "https://api.github.com/repos/cli/cli/releases/latest" \
 | grep '"tag_name"' | sed 's/.*"v\([^"]*\)".*/\1/') || {
Expand All@@ -133,10 +147,18 @@ _install_gh_binary() {
 return 1
 fi

 log_step "Downloading gh v${latest_version} for ${gh_os}/${gh_arch}..."
 echo "${latest_version}"
}

# Download and extract a gh release tarball into ~/.local/bin
# Usage: _download_and_install_gh VERSION GH_OS GH_ARCH
_download_and_install_gh() {
 local version="${1}" gh_os="${2}" gh_arch="${3}"

 log_step "Downloading gh v${version} for ${gh_os}/${gh_arch}..."

 local tarball="gh_${latest_version}_${gh_os}_${gh_arch}.tar.gz"
 local url="https://github.com/cli/cli/releases/download/v${latest_version}/${tarball}"
 local tarball="gh_${version}_${gh_os}_${gh_arch}.tar.gz"
 local url="https://github.com/cli/cli/releases/download/v${version}/${tarball}"
 local tmpdir
 tmpdir=$(mktemp -d)

Expand All@@ -152,9 +174,8 @@ _install_gh_binary() {
 return 1
 }

 # Install to ~/.local/bin
 mkdir -p "${HOME}/.local/bin"
 cp "${tmpdir}/gh_${latest_version}_${gh_os}_${gh_arch}/bin/gh" "${HOME}/.local/bin/gh"
 cp "${tmpdir}/gh_${version}_${gh_os}_${gh_arch}/bin/gh" "${HOME}/.local/bin/gh"
 chmod +x "${HOME}/.local/bin/gh"
 rm -rf "${tmpdir}"

Expand All@@ -167,6 +188,20 @@ _install_gh_binary() {
 log_info "gh installed to ${HOME}/.local/bin/gh"
}

_install_gh_binary() {
 log_step "Installing gh from GitHub releases (binary fallback)..."

 local platform
 platform=$(_detect_gh_platform) || return 1
 local gh_os gh_arch
 read -r gh_os gh_arch <<< "${platform}"

 local latest_version
 latest_version=$(_fetch_gh_latest_version) || return 1

 _download_and_install_gh "${latest_version}" "${gh_os}" "${gh_arch}"
}

# ============================================================
# ensure_gh_auth — Authenticate with GitHub via gh auth login
# ============================================================
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: decompose ensure_jq and ensure_gh_cli into focused helpers#994

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

 Merged

louisgv
merged 1 commit into

from

Feb 13, 2026
 Merged


refactor: decompose ensure_jq and ensure_gh_cli into focused helpers
#994
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


66 changes: 48 additions & 18 deletions
shared/common.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,6 +113,49 @@ check_python_available() {
}

# Install jq if not already present (required by some cloud providers)
# Platform-specific jq install helpers
_install_jq_brew() {
 if command -v brew &>/dev/null; then
 brew install jq || { log_error "Failed to install jq via Homebrew. Run 'brew install jq' manually."; return 1; }
 else
 log_error "jq is required but not installed"
 log_error "Install it with: brew install jq"
 log_error "If Homebrew is not available: https://jqlang.github.io/jq/download/"
 return 1
 fi
}

_install_jq_apt() {
 sudo apt-get update -qq && sudo apt-get install -y jq || {
 log_error "Failed to install jq via apt. Run 'sudo apt-get install -y jq' manually."
 return 1
 }
}

_install_jq_dnf() {
 sudo dnf install -y jq || {
 log_error "Failed to install jq via dnf. Run 'sudo dnf install -y jq' manually."
 return 1
 }
}

_install_jq_apk() {
 sudo apk add jq || {
 log_error "Failed to install jq via apk. Run 'sudo apk add jq' manually."
 return 1
 }
}

_report_jq_not_found() {
 log_error "jq is required but not installed"
 log_error ""
 log_error "Install jq for your system:"
 log_error " Ubuntu/Debian: sudo apt-get install -y jq"
 log_error " Fedora/RHEL: sudo dnf install -y jq"
 log_error " macOS: brew install jq"
 log_error " Other: https://jqlang.github.io/jq/download/"
}

ensure_jq() {
 if command -v jq &>/dev/null; then
 return 0
Expand All@@ -121,28 +164,15 @@ ensure_jq() {
 log_step "Installing jq..."

 if [[ "$OSTYPE" == "darwin"* ]]; then
 if command -v brew &>/dev/null; then
 brew install jq || { log_error "Failed to install jq via Homebrew. Run 'brew install jq' manually."; return 1; }
 else
 log_error "jq is required but not installed"
 log_error "Install it with: brew install jq"
 log_error "If Homebrew is not available: https://jqlang.github.io/jq/download/"
 return 1
 fi
 _install_jq_brew || return 1
 elif command -v apt-get &>/dev/null; then
sudo apt-get update -qq && sudo apt-get install -y jq || { log_error "Failed to install jq via apt. Run 'sudo apt-get install -y jq' manually."; return 1; }
_install_jq_apt || return 1
 elif command -v dnf &>/dev/null; then
sudo dnf install -y jq || { log_error "Failed to install jq via dnf. Run 'sudo dnf install -y jq' manually."; return 1; }
_install_jq_dnf || return 1
 elif command -v apk &>/dev/null; then
sudo apk add jq || { log_error "Failed to install jq via apk. Run 'sudo apk add jq' manually."; return 1; }
_install_jq_apk || return 1
 else
 log_error "jq is required but not installed"
 log_error ""
 log_error "Install jq for your system:"
 log_error " Ubuntu/Debian: sudo apt-get install -y jq"
 log_error " Fedora/RHEL: sudo dnf install -y jq"
 log_error " macOS: brew install jq"
 log_error " Other: https://jqlang.github.io/jq/download/"
 _report_jq_not_found
 return 1
 fi

Expand Down

115 changes: 75 additions & 40 deletions
shared/github-auth.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,44 @@ fi
# ensure_gh_cli — Install gh CLI if not already present
# ============================================================

# Install gh via Homebrew (macOS)
_install_gh_brew() {
 if command -v brew &>/dev/null; then
 brew install gh || {
 log_error "Failed to install gh via Homebrew"
 return 1
 }
 else
 log_error "Homebrew not found. Install Homebrew first: https://brew.sh"
 log_error "Then run: brew install gh"
 return 1
 fi
}

# Install gh via APT with GitHub's official repository (Debian/Ubuntu)
_install_gh_apt() {
 log_step "Adding GitHub CLI APT repository..."
 curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
 | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg 2>/dev/null
 sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg
 printf 'deb [arch=%s signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\n' \
 "$(dpkg --print-architecture)" \
 | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
 sudo apt-get update -qq
 sudo apt-get install -y gh || {
 log_error "Failed to install gh via apt"
 return 1
 }
}

# Install gh via DNF (Fedora/RHEL)
_install_gh_dnf() {
 sudo dnf install -y gh || {
 log_error "Failed to install gh via dnf"
 return 1
 }
}

ensure_gh_cli() {
 if command -v gh &>/dev/null; then
 log_info "GitHub CLI (gh) available: $(gh --version | head -1)"
Expand All@@ -42,44 +80,16 @@ ensure_gh_cli() {
 log_step "Installing GitHub CLI (gh)..."

 if [[ "$OSTYPE" == "darwin"* ]]; then
 # macOS — require Homebrew
 if command -v brew &>/dev/null; then
 brew install gh || {
 log_error "Failed to install gh via Homebrew"
 return 1
 }
 else
 log_error "Homebrew not found. Install Homebrew first: https://brew.sh"
 log_error "Then run: brew install gh"
 return 1
 fi
 _install_gh_brew || return 1
 elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
 if command -v apt-get &>/dev/null; then
 # Debian/Ubuntu — add GitHub's official APT repo
 log_step "Adding GitHub CLI APT repository..."
 curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
 | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg 2>/dev/null
 sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg
 printf 'deb [arch=%s signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\n' \
 "$(dpkg --print-architecture)" \
 | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
 sudo apt-get update -qq
 sudo apt-get install -y gh || {
 log_error "Failed to install gh via apt"
 return 1
 }
 _install_gh_apt || return 1
 elif command -v dnf &>/dev/null; then
 # Fedora/RHEL
 sudo dnf install -y gh || {
 log_error "Failed to install gh via dnf"
 return 1
 }
 _install_gh_dnf || return 1
 else
 # Fallback — download prebuilt binary
 _install_gh_binary || return 1
 fi
 else
 # Unknown OS — try binary fallback
 _install_gh_binary || return 1
 fi

Expand All@@ -95,9 +105,9 @@ ensure_gh_cli() {
# Binary fallback installer (non-apt/non-brew systems)
# ============================================================

_install_gh_binary() {
 log_step "Installing gh from GitHub releases (binary fallback)..."

# Detect OS and architecture for binary downloads, outputting "os arch" on stdout.
# Returns 1 with error message if platform is unsupported.
_detect_gh_platform() {
 local os arch gh_os gh_arch
 os="$(uname -s)"
 arch="$(uname -m)"
Expand All@@ -120,7 +130,11 @@ _install_gh_binary() {
 ;;
 esac

 # Get latest release version
 echo "${gh_os} ${gh_arch}"
}

# Fetch the latest gh release version string from GitHub API
_fetch_gh_latest_version() {
 local latest_version
 latest_version=$(curl -fsSL "https://api.github.com/repos/cli/cli/releases/latest" \
 | grep '"tag_name"' | sed 's/.*"v\([^"]*\)".*/\1/') || {
Expand All@@ -133,10 +147,18 @@ _install_gh_binary() {
 return 1
 fi

 log_step "Downloading gh v${latest_version} for ${gh_os}/${gh_arch}..."
 echo "${latest_version}"
}

# Download and extract a gh release tarball into ~/.local/bin
# Usage: _download_and_install_gh VERSION GH_OS GH_ARCH
_download_and_install_gh() {
 local version="${1}" gh_os="${2}" gh_arch="${3}"

 log_step "Downloading gh v${version} for ${gh_os}/${gh_arch}..."

 local tarball="gh_${latest_version}_${gh_os}_${gh_arch}.tar.gz"
 local url="https://github.com/cli/cli/releases/download/v${latest_version}/${tarball}"
 local tarball="gh_${version}_${gh_os}_${gh_arch}.tar.gz"
 local url="https://github.com/cli/cli/releases/download/v${version}/${tarball}"
 local tmpdir
 tmpdir=$(mktemp -d)

Expand All@@ -152,9 +174,8 @@ _install_gh_binary() {
 return 1
 }

 # Install to ~/.local/bin
 mkdir -p "${HOME}/.local/bin"
 cp "${tmpdir}/gh_${latest_version}_${gh_os}_${gh_arch}/bin/gh" "${HOME}/.local/bin/gh"
 cp "${tmpdir}/gh_${version}_${gh_os}_${gh_arch}/bin/gh" "${HOME}/.local/bin/gh"
 chmod +x "${HOME}/.local/bin/gh"
 rm -rf "${tmpdir}"

Expand All@@ -167,6 +188,20 @@ _install_gh_binary() {
 log_info "gh installed to ${HOME}/.local/bin/gh"
}

_install_gh_binary() {
 log_step "Installing gh from GitHub releases (binary fallback)..."

 local platform
 platform=$(_detect_gh_platform) || return 1
 local gh_os gh_arch
 read -r gh_os gh_arch <<< "${platform}"

 local latest_version
 latest_version=$(_fetch_gh_latest_version) || return 1

 _download_and_install_gh "${latest_version}" "${gh_os}" "${gh_arch}"
}

# ============================================================
# ensure_gh_auth — Authenticate with GitHub via gh auth login
# ============================================================
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: decompose ensure_jq and ensure_gh_cli into focused helpers#994

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

 Merged

louisgv
merged 1 commit into

from

Feb 13, 2026
 Merged


refactor: decompose ensure_jq and ensure_gh_cli into focused helpers
#994
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


66 changes: 48 additions & 18 deletions
shared/common.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,6 +113,49 @@ check_python_available() {
}

# Install jq if not already present (required by some cloud providers)
# Platform-specific jq install helpers
_install_jq_brew() {
 if command -v brew &>/dev/null; then
 brew install jq || { log_error "Failed to install jq via Homebrew. Run 'brew install jq' manually."; return 1; }
 else
 log_error "jq is required but not installed"
 log_error "Install it with: brew install jq"
 log_error "If Homebrew is not available: https://jqlang.github.io/jq/download/"
 return 1
 fi
}

_install_jq_apt() {
 sudo apt-get update -qq && sudo apt-get install -y jq || {
 log_error "Failed to install jq via apt. Run 'sudo apt-get install -y jq' manually."
 return 1
 }
}

_install_jq_dnf() {
 sudo dnf install -y jq || {
 log_error "Failed to install jq via dnf. Run 'sudo dnf install -y jq' manually."
 return 1
 }
}

_install_jq_apk() {
 sudo apk add jq || {
 log_error "Failed to install jq via apk. Run 'sudo apk add jq' manually."
 return 1
 }
}

_report_jq_not_found() {
 log_error "jq is required but not installed"
 log_error ""
 log_error "Install jq for your system:"
 log_error " Ubuntu/Debian: sudo apt-get install -y jq"
 log_error " Fedora/RHEL: sudo dnf install -y jq"
 log_error " macOS: brew install jq"
 log_error " Other: https://jqlang.github.io/jq/download/"
}

ensure_jq() {
 if command -v jq &>/dev/null; then
 return 0
Expand All@@ -121,28 +164,15 @@ ensure_jq() {
 log_step "Installing jq..."

 if [[ "$OSTYPE" == "darwin"* ]]; then
 if command -v brew &>/dev/null; then
 brew install jq || { log_error "Failed to install jq via Homebrew. Run 'brew install jq' manually."; return 1; }
 else
 log_error "jq is required but not installed"
 log_error "Install it with: brew install jq"
 log_error "If Homebrew is not available: https://jqlang.github.io/jq/download/"
 return 1
 fi
 _install_jq_brew || return 1
 elif command -v apt-get &>/dev/null; then
sudo apt-get update -qq && sudo apt-get install -y jq || { log_error "Failed to install jq via apt. Run 'sudo apt-get install -y jq' manually."; return 1; }
_install_jq_apt || return 1
 elif command -v dnf &>/dev/null; then
sudo dnf install -y jq || { log_error "Failed to install jq via dnf. Run 'sudo dnf install -y jq' manually."; return 1; }
_install_jq_dnf || return 1
 elif command -v apk &>/dev/null; then
sudo apk add jq || { log_error "Failed to install jq via apk. Run 'sudo apk add jq' manually."; return 1; }
_install_jq_apk || return 1
 else
 log_error "jq is required but not installed"
 log_error ""
 log_error "Install jq for your system:"
 log_error " Ubuntu/Debian: sudo apt-get install -y jq"
 log_error " Fedora/RHEL: sudo dnf install -y jq"
 log_error " macOS: brew install jq"
 log_error " Other: https://jqlang.github.io/jq/download/"
 _report_jq_not_found
 return 1
 fi

Expand Down

115 changes: 75 additions & 40 deletions
shared/github-auth.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,44 @@ fi
# ensure_gh_cli — Install gh CLI if not already present
# ============================================================

# Install gh via Homebrew (macOS)
_install_gh_brew() {
 if command -v brew &>/dev/null; then
 brew install gh || {
 log_error "Failed to install gh via Homebrew"
 return 1
 }
 else
 log_error "Homebrew not found. Install Homebrew first: https://brew.sh"
 log_error "Then run: brew install gh"
 return 1
 fi
}

# Install gh via APT with GitHub's official repository (Debian/Ubuntu)
_install_gh_apt() {
 log_step "Adding GitHub CLI APT repository..."
 curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
 | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg 2>/dev/null
 sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg
 printf 'deb [arch=%s signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\n' \
 "$(dpkg --print-architecture)" \
 | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
 sudo apt-get update -qq
 sudo apt-get install -y gh || {
 log_error "Failed to install gh via apt"
 return 1
 }
}

# Install gh via DNF (Fedora/RHEL)
_install_gh_dnf() {
 sudo dnf install -y gh || {
 log_error "Failed to install gh via dnf"
 return 1
 }
}

ensure_gh_cli() {
 if command -v gh &>/dev/null; then
 log_info "GitHub CLI (gh) available: $(gh --version | head -1)"
Expand All@@ -42,44 +80,16 @@ ensure_gh_cli() {
 log_step "Installing GitHub CLI (gh)..."

 if [[ "$OSTYPE" == "darwin"* ]]; then
 # macOS — require Homebrew
 if command -v brew &>/dev/null; then
 brew install gh || {
 log_error "Failed to install gh via Homebrew"
 return 1
 }
 else
 log_error "Homebrew not found. Install Homebrew first: https://brew.sh"
 log_error "Then run: brew install gh"
 return 1
 fi
 _install_gh_brew || return 1
 elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
 if command -v apt-get &>/dev/null; then
 # Debian/Ubuntu — add GitHub's official APT repo
 log_step "Adding GitHub CLI APT repository..."
 curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
 | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg 2>/dev/null
 sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg
 printf 'deb [arch=%s signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\n' \
 "$(dpkg --print-architecture)" \
 | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
 sudo apt-get update -qq
 sudo apt-get install -y gh || {
 log_error "Failed to install gh via apt"
 return 1
 }
 _install_gh_apt || return 1
 elif command -v dnf &>/dev/null; then
 # Fedora/RHEL
 sudo dnf install -y gh || {
 log_error "Failed to install gh via dnf"
 return 1
 }
 _install_gh_dnf || return 1
 else
 # Fallback — download prebuilt binary
 _install_gh_binary || return 1
 fi
 else
 # Unknown OS — try binary fallback
 _install_gh_binary || return 1
 fi

Expand All@@ -95,9 +105,9 @@ ensure_gh_cli() {
# Binary fallback installer (non-apt/non-brew systems)
# ============================================================

_install_gh_binary() {
 log_step "Installing gh from GitHub releases (binary fallback)..."

# Detect OS and architecture for binary downloads, outputting "os arch" on stdout.
# Returns 1 with error message if platform is unsupported.
_detect_gh_platform() {
 local os arch gh_os gh_arch
 os="$(uname -s)"
 arch="$(uname -m)"
Expand All@@ -120,7 +130,11 @@ _install_gh_binary() {
 ;;
 esac

 # Get latest release version
 echo "${gh_os} ${gh_arch}"
}

# Fetch the latest gh release version string from GitHub API
_fetch_gh_latest_version() {
 local latest_version
 latest_version=$(curl -fsSL "https://api.github.com/repos/cli/cli/releases/latest" \
 | grep '"tag_name"' | sed 's/.*"v\([^"]*\)".*/\1/') || {
Expand All@@ -133,10 +147,18 @@ _install_gh_binary() {
 return 1
 fi

 log_step "Downloading gh v${latest_version} for ${gh_os}/${gh_arch}..."
 echo "${latest_version}"
}

# Download and extract a gh release tarball into ~/.local/bin
# Usage: _download_and_install_gh VERSION GH_OS GH_ARCH
_download_and_install_gh() {
 local version="${1}" gh_os="${2}" gh_arch="${3}"

 log_step "Downloading gh v${version} for ${gh_os}/${gh_arch}..."

 local tarball="gh_${latest_version}_${gh_os}_${gh_arch}.tar.gz"
 local url="https://github.com/cli/cli/releases/download/v${latest_version}/${tarball}"
 local tarball="gh_${version}_${gh_os}_${gh_arch}.tar.gz"
 local url="https://github.com/cli/cli/releases/download/v${version}/${tarball}"
 local tmpdir
 tmpdir=$(mktemp -d)

Expand All@@ -152,9 +174,8 @@ _install_gh_binary() {
 return 1
 }

 # Install to ~/.local/bin
 mkdir -p "${HOME}/.local/bin"
 cp "${tmpdir}/gh_${latest_version}_${gh_os}_${gh_arch}/bin/gh" "${HOME}/.local/bin/gh"
 cp "${tmpdir}/gh_${version}_${gh_os}_${gh_arch}/bin/gh" "${HOME}/.local/bin/gh"
 chmod +x "${HOME}/.local/bin/gh"
 rm -rf "${tmpdir}"

Expand All@@ -167,6 +188,20 @@ _install_gh_binary() {
 log_info "gh installed to ${HOME}/.local/bin/gh"
}

_install_gh_binary() {
 log_step "Installing gh from GitHub releases (binary fallback)..."

 local platform
 platform=$(_detect_gh_platform) || return 1
 local gh_os gh_arch
 read -r gh_os gh_arch <<< "${platform}"

 local latest_version
 latest_version=$(_fetch_gh_latest_version) || return 1

 _download_and_install_gh "${latest_version}" "${gh_os}" "${gh_arch}"
}

# ============================================================
# ensure_gh_auth — Authenticate with GitHub via gh auth login
# ============================================================
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
refactor: decompose ensure_jq and ensure_gh_cli into focused helpers#994

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

 Merged

louisgv
merged 1 commit into

from

Feb 13, 2026
 Merged


refactor: decompose ensure_jq and ensure_gh_cli into focused helpers
#994
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


66 changes: 48 additions & 18 deletions
shared/common.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,6 +113,49 @@ check_python_available() {
}

# Install jq if not already present (required by some cloud providers)
# Platform-specific jq install helpers
_install_jq_brew() {
 if command -v brew &>/dev/null; then
 brew install jq || { log_error "Failed to install jq via Homebrew. Run 'brew install jq' manually."; return 1; }
 else
 log_error "jq is required but not installed"
 log_error "Install it with: brew install jq"
 log_error "If Homebrew is not available: https://jqlang.github.io/jq/download/"
 return 1
 fi
}

_install_jq_apt() {
 sudo apt-get update -qq && sudo apt-get install -y jq || {
 log_error "Failed to install jq via apt. Run 'sudo apt-get install -y jq' manually."
 return 1
 }
}

_install_jq_dnf() {
 sudo dnf install -y jq || {
 log_error "Failed to install jq via dnf. Run 'sudo dnf install -y jq' manually."
 return 1
 }
}

_install_jq_apk() {
 sudo apk add jq || {
 log_error "Failed to install jq via apk. Run 'sudo apk add jq' manually."
 return 1
 }
}

_report_jq_not_found() {
 log_error "jq is required but not installed"
 log_error ""
 log_error "Install jq for your system:"
 log_error " Ubuntu/Debian: sudo apt-get install -y jq"
 log_error " Fedora/RHEL: sudo dnf install -y jq"
 log_error " macOS: brew install jq"
 log_error " Other: https://jqlang.github.io/jq/download/"
}

ensure_jq() {
 if command -v jq &>/dev/null; then
 return 0
Expand All@@ -121,28 +164,15 @@ ensure_jq() {
 log_step "Installing jq..."

 if [[ "$OSTYPE" == "darwin"* ]]; then
 if command -v brew &>/dev/null; then
 brew install jq || { log_error "Failed to install jq via Homebrew. Run 'brew install jq' manually."; return 1; }
 else
 log_error "jq is required but not installed"
 log_error "Install it with: brew install jq"
 log_error "If Homebrew is not available: https://jqlang.github.io/jq/download/"
 return 1
 fi
 _install_jq_brew || return 1
 elif command -v apt-get &>/dev/null; then
sudo apt-get update -qq && sudo apt-get install -y jq || { log_error "Failed to install jq via apt. Run 'sudo apt-get install -y jq' manually."; return 1; }
_install_jq_apt || return 1
 elif command -v dnf &>/dev/null; then
sudo dnf install -y jq || { log_error "Failed to install jq via dnf. Run 'sudo dnf install -y jq' manually."; return 1; }
_install_jq_dnf || return 1
 elif command -v apk &>/dev/null; then
sudo apk add jq || { log_error "Failed to install jq via apk. Run 'sudo apk add jq' manually."; return 1; }
_install_jq_apk || return 1
 else
 log_error "jq is required but not installed"
 log_error ""
 log_error "Install jq for your system:"
 log_error " Ubuntu/Debian: sudo apt-get install -y jq"
 log_error " Fedora/RHEL: sudo dnf install -y jq"
 log_error " macOS: brew install jq"
 log_error " Other: https://jqlang.github.io/jq/download/"
 _report_jq_not_found
 return 1
 fi

Expand Down

115 changes: 75 additions & 40 deletions
shared/github-auth.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,44 @@ fi
# ensure_gh_cli — Install gh CLI if not already present
# ============================================================

# Install gh via Homebrew (macOS)
_install_gh_brew() {
 if command -v brew &>/dev/null; then
 brew install gh || {
 log_error "Failed to install gh via Homebrew"
 return 1
 }
 else
 log_error "Homebrew not found. Install Homebrew first: https://brew.sh"
 log_error "Then run: brew install gh"
 return 1
 fi
}

# Install gh via APT with GitHub's official repository (Debian/Ubuntu)
_install_gh_apt() {
 log_step "Adding GitHub CLI APT repository..."
 curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
 | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg 2>/dev/null
 sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg
 printf 'deb [arch=%s signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\n' \
 "$(dpkg --print-architecture)" \
 | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
 sudo apt-get update -qq
 sudo apt-get install -y gh || {
 log_error "Failed to install gh via apt"
 return 1
 }
}

# Install gh via DNF (Fedora/RHEL)
_install_gh_dnf() {
 sudo dnf install -y gh || {
 log_error "Failed to install gh via dnf"
 return 1
 }
}

ensure_gh_cli() {
 if command -v gh &>/dev/null; then
 log_info "GitHub CLI (gh) available: $(gh --version | head -1)"
Expand All@@ -42,44 +80,16 @@ ensure_gh_cli() {
 log_step "Installing GitHub CLI (gh)..."

 if [[ "$OSTYPE" == "darwin"* ]]; then
 # macOS — require Homebrew
 if command -v brew &>/dev/null; then
 brew install gh || {
 log_error "Failed to install gh via Homebrew"
 return 1
 }
 else
 log_error "Homebrew not found. Install Homebrew first: https://brew.sh"
 log_error "Then run: brew install gh"
 return 1
 fi
 _install_gh_brew || return 1
 elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
 if command -v apt-get &>/dev/null; then
 # Debian/Ubuntu — add GitHub's official APT repo
 log_step "Adding GitHub CLI APT repository..."
 curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
 | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg 2>/dev/null
 sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg
 printf 'deb [arch=%s signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\n' \
 "$(dpkg --print-architecture)" \
 | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
 sudo apt-get update -qq
 sudo apt-get install -y gh || {
 log_error "Failed to install gh via apt"
 return 1
 }
 _install_gh_apt || return 1
 elif command -v dnf &>/dev/null; then
 # Fedora/RHEL
 sudo dnf install -y gh || {
 log_error "Failed to install gh via dnf"
 return 1
 }
 _install_gh_dnf || return 1
 else
 # Fallback — download prebuilt binary
 _install_gh_binary || return 1
 fi
 else
 # Unknown OS — try binary fallback
 _install_gh_binary || return 1
 fi

Expand All@@ -95,9 +105,9 @@ ensure_gh_cli() {
# Binary fallback installer (non-apt/non-brew systems)
# ============================================================

_install_gh_binary() {
 log_step "Installing gh from GitHub releases (binary fallback)..."

# Detect OS and architecture for binary downloads, outputting "os arch" on stdout.
# Returns 1 with error message if platform is unsupported.
_detect_gh_platform() {
 local os arch gh_os gh_arch
 os="$(uname -s)"
 arch="$(uname -m)"
Expand All@@ -120,7 +130,11 @@ _install_gh_binary() {
 ;;
 esac

 # Get latest release version
 echo "${gh_os} ${gh_arch}"
}

# Fetch the latest gh release version string from GitHub API
_fetch_gh_latest_version() {
 local latest_version
 latest_version=$(curl -fsSL "https://api.github.com/repos/cli/cli/releases/latest" \
 | grep '"tag_name"' | sed 's/.*"v\([^"]*\)".*/\1/') || {
Expand All@@ -133,10 +147,18 @@ _install_gh_binary() {
 return 1
 fi

 log_step "Downloading gh v${latest_version} for ${gh_os}/${gh_arch}..."
 echo "${latest_version}"
}

# Download and extract a gh release tarball into ~/.local/bin
# Usage: _download_and_install_gh VERSION GH_OS GH_ARCH
_download_and_install_gh() {
 local version="${1}" gh_os="${2}" gh_arch="${3}"

 log_step "Downloading gh v${version} for ${gh_os}/${gh_arch}..."

 local tarball="gh_${latest_version}_${gh_os}_${gh_arch}.tar.gz"
 local url="https://github.com/cli/cli/releases/download/v${latest_version}/${tarball}"
 local tarball="gh_${version}_${gh_os}_${gh_arch}.tar.gz"
 local url="https://github.com/cli/cli/releases/download/v${version}/${tarball}"
 local tmpdir
 tmpdir=$(mktemp -d)

Expand All@@ -152,9 +174,8 @@ _install_gh_binary() {
 return 1
 }

 # Install to ~/.local/bin
 mkdir -p "${HOME}/.local/bin"
 cp "${tmpdir}/gh_${latest_version}_${gh_os}_${gh_arch}/bin/gh" "${HOME}/.local/bin/gh"
 cp "${tmpdir}/gh_${version}_${gh_os}_${gh_arch}/bin/gh" "${HOME}/.local/bin/gh"
 chmod +x "${HOME}/.local/bin/gh"
 rm -rf "${tmpdir}"

Expand All@@ -167,6 +188,20 @@ _install_gh_binary() {
 log_info "gh installed to ${HOME}/.local/bin/gh"
}

_install_gh_binary() {
 log_step "Installing gh from GitHub releases (binary fallback)..."

 local platform
 platform=$(_detect_gh_platform) || return 1
 local gh_os gh_arch
 read -r gh_os gh_arch <<< "${platform}"

 local latest_version
 latest_version=$(_fetch_gh_latest_version) || return 1

 _download_and_install_gh "${latest_version}" "${gh_os}" "${gh_arch}"
}

# ============================================================
# ensure_gh_auth — Authenticate with GitHub via gh auth login
# ============================================================
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: decompose ensure_jq and ensure_gh_cli into focused helpers#994

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

 Merged

louisgv
merged 1 commit into

from

Feb 13, 2026
 Merged


refactor: decompose ensure_jq and ensure_gh_cli into focused helpers
#994
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


66 changes: 48 additions & 18 deletions
shared/common.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,6 +113,49 @@ check_python_available() {
}

# Install jq if not already present (required by some cloud providers)
# Platform-specific jq install helpers
_install_jq_brew() {
 if command -v brew &>/dev/null; then
 brew install jq || { log_error "Failed to install jq via Homebrew. Run 'brew install jq' manually."; return 1; }
 else
 log_error "jq is required but not installed"
 log_error "Install it with: brew install jq"
 log_error "If Homebrew is not available: https://jqlang.github.io/jq/download/"
 return 1
 fi
}

_install_jq_apt() {
 sudo apt-get update -qq && sudo apt-get install -y jq || {
 log_error "Failed to install jq via apt. Run 'sudo apt-get install -y jq' manually."
 return 1
 }
}

_install_jq_dnf() {
 sudo dnf install -y jq || {
 log_error "Failed to install jq via dnf. Run 'sudo dnf install -y jq' manually."
 return 1
 }
}

_install_jq_apk() {
 sudo apk add jq || {
 log_error "Failed to install jq via apk. Run 'sudo apk add jq' manually."
 return 1
 }
}

_report_jq_not_found() {
 log_error "jq is required but not installed"
 log_error ""
 log_error "Install jq for your system:"
 log_error " Ubuntu/Debian: sudo apt-get install -y jq"
 log_error " Fedora/RHEL: sudo dnf install -y jq"
 log_error " macOS: brew install jq"
 log_error " Other: https://jqlang.github.io/jq/download/"
}

ensure_jq() {
 if command -v jq &>/dev/null; then
 return 0
Expand All@@ -121,28 +164,15 @@ ensure_jq() {
 log_step "Installing jq..."

 if [[ "$OSTYPE" == "darwin"* ]]; then
 if command -v brew &>/dev/null; then
 brew install jq || { log_error "Failed to install jq via Homebrew. Run 'brew install jq' manually."; return 1; }
 else
 log_error "jq is required but not installed"
 log_error "Install it with: brew install jq"
 log_error "If Homebrew is not available: https://jqlang.github.io/jq/download/"
 return 1
 fi
 _install_jq_brew || return 1
 elif command -v apt-get &>/dev/null; then
sudo apt-get update -qq && sudo apt-get install -y jq || { log_error "Failed to install jq via apt. Run 'sudo apt-get install -y jq' manually."; return 1; }
_install_jq_apt || return 1
 elif command -v dnf &>/dev/null; then
sudo dnf install -y jq || { log_error "Failed to install jq via dnf. Run 'sudo dnf install -y jq' manually."; return 1; }
_install_jq_dnf || return 1
 elif command -v apk &>/dev/null; then
sudo apk add jq || { log_error "Failed to install jq via apk. Run 'sudo apk add jq' manually."; return 1; }
_install_jq_apk || return 1
 else
 log_error "jq is required but not installed"
 log_error ""
 log_error "Install jq for your system:"
 log_error " Ubuntu/Debian: sudo apt-get install -y jq"
 log_error " Fedora/RHEL: sudo dnf install -y jq"
 log_error " macOS: brew install jq"
 log_error " Other: https://jqlang.github.io/jq/download/"
 _report_jq_not_found
 return 1
 fi

Expand Down

115 changes: 75 additions & 40 deletions
shared/github-auth.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,44 @@ fi
# ensure_gh_cli — Install gh CLI if not already present
# ============================================================

# Install gh via Homebrew (macOS)
_install_gh_brew() {
 if command -v brew &>/dev/null; then
 brew install gh || {
 log_error "Failed to install gh via Homebrew"
 return 1
 }
 else
 log_error "Homebrew not found. Install Homebrew first: https://brew.sh"
 log_error "Then run: brew install gh"
 return 1
 fi
}

# Install gh via APT with GitHub's official repository (Debian/Ubuntu)
_install_gh_apt() {
 log_step "Adding GitHub CLI APT repository..."
 curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
 | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg 2>/dev/null
 sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg
 printf 'deb [arch=%s signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\n' \
 "$(dpkg --print-architecture)" \
 | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
 sudo apt-get update -qq
 sudo apt-get install -y gh || {
 log_error "Failed to install gh via apt"
 return 1
 }
}

# Install gh via DNF (Fedora/RHEL)
_install_gh_dnf() {
 sudo dnf install -y gh || {
 log_error "Failed to install gh via dnf"
 return 1
 }
}

ensure_gh_cli() {
 if command -v gh &>/dev/null; then
 log_info "GitHub CLI (gh) available: $(gh --version | head -1)"
Expand All@@ -42,44 +80,16 @@ ensure_gh_cli() {
 log_step "Installing GitHub CLI (gh)..."

 if [[ "$OSTYPE" == "darwin"* ]]; then
 # macOS — require Homebrew
 if command -v brew &>/dev/null; then
 brew install gh || {
 log_error "Failed to install gh via Homebrew"
 return 1
 }
 else
 log_error "Homebrew not found. Install Homebrew first: https://brew.sh"
 log_error "Then run: brew install gh"
 return 1
 fi
 _install_gh_brew || return 1
 elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
 if command -v apt-get &>/dev/null; then
 # Debian/Ubuntu — add GitHub's official APT repo
 log_step "Adding GitHub CLI APT repository..."
 curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
 | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg 2>/dev/null
 sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg
 printf 'deb [arch=%s signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\n' \
 "$(dpkg --print-architecture)" \
 | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
 sudo apt-get update -qq
 sudo apt-get install -y gh || {
 log_error "Failed to install gh via apt"
 return 1
 }
 _install_gh_apt || return 1
 elif command -v dnf &>/dev/null; then
 # Fedora/RHEL
 sudo dnf install -y gh || {
 log_error "Failed to install gh via dnf"
 return 1
 }
 _install_gh_dnf || return 1
 else
 # Fallback — download prebuilt binary
 _install_gh_binary || return 1
 fi
 else
 # Unknown OS — try binary fallback
 _install_gh_binary || return 1
 fi

Expand All@@ -95,9 +105,9 @@ ensure_gh_cli() {
# Binary fallback installer (non-apt/non-brew systems)
# ============================================================

_install_gh_binary() {
 log_step "Installing gh from GitHub releases (binary fallback)..."

# Detect OS and architecture for binary downloads, outputting "os arch" on stdout.
# Returns 1 with error message if platform is unsupported.
_detect_gh_platform() {
 local os arch gh_os gh_arch
 os="$(uname -s)"
 arch="$(uname -m)"
Expand All@@ -120,7 +130,11 @@ _install_gh_binary() {
 ;;
 esac

 # Get latest release version
 echo "${gh_os} ${gh_arch}"
}

# Fetch the latest gh release version string from GitHub API
_fetch_gh_latest_version() {
 local latest_version
 latest_version=$(curl -fsSL "https://api.github.com/repos/cli/cli/releases/latest" \
 | grep '"tag_name"' | sed 's/.*"v\([^"]*\)".*/\1/') || {
Expand All@@ -133,10 +147,18 @@ _install_gh_binary() {
 return 1
 fi

 log_step "Downloading gh v${latest_version} for ${gh_os}/${gh_arch}..."
 echo "${latest_version}"
}

# Download and extract a gh release tarball into ~/.local/bin
# Usage: _download_and_install_gh VERSION GH_OS GH_ARCH
_download_and_install_gh() {
 local version="${1}" gh_os="${2}" gh_arch="${3}"

 log_step "Downloading gh v${version} for ${gh_os}/${gh_arch}..."

 local tarball="gh_${latest_version}_${gh_os}_${gh_arch}.tar.gz"
 local url="https://github.com/cli/cli/releases/download/v${latest_version}/${tarball}"
 local tarball="gh_${version}_${gh_os}_${gh_arch}.tar.gz"
 local url="https://github.com/cli/cli/releases/download/v${version}/${tarball}"
 local tmpdir
 tmpdir=$(mktemp -d)

Expand All@@ -152,9 +174,8 @@ _install_gh_binary() {
 return 1
 }

 # Install to ~/.local/bin
 mkdir -p "${HOME}/.local/bin"
 cp "${tmpdir}/gh_${latest_version}_${gh_os}_${gh_arch}/bin/gh" "${HOME}/.local/bin/gh"
 cp "${tmpdir}/gh_${version}_${gh_os}_${gh_arch}/bin/gh" "${HOME}/.local/bin/gh"
 chmod +x "${HOME}/.local/bin/gh"
 rm -rf "${tmpdir}"

Expand All@@ -167,6 +188,20 @@ _install_gh_binary() {
 log_info "gh installed to ${HOME}/.local/bin/gh"
}

_install_gh_binary() {
 log_step "Installing gh from GitHub releases (binary fallback)..."

 local platform
 platform=$(_detect_gh_platform) || return 1
 local gh_os gh_arch
 read -r gh_os gh_arch <<< "${platform}"

 local latest_version
 latest_version=$(_fetch_gh_latest_version) || return 1

 _download_and_install_gh "${latest_version}" "${gh_os}" "${gh_arch}"
}

# ============================================================
# ensure_gh_auth — Authenticate with GitHub via gh auth login
# ============================================================
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: decompose ensure_jq and ensure_gh_cli into focused helpers#994

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

 Merged

louisgv
merged 1 commit into

from

Feb 13, 2026
 Merged


refactor: decompose ensure_jq and ensure_gh_cli into focused helpers
#994
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


66 changes: 48 additions & 18 deletions
shared/common.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,6 +113,49 @@ check_python_available() {
}

# Install jq if not already present (required by some cloud providers)
# Platform-specific jq install helpers
_install_jq_brew() {
 if command -v brew &>/dev/null; then
 brew install jq || { log_error "Failed to install jq via Homebrew. Run 'brew install jq' manually."; return 1; }
 else
 log_error "jq is required but not installed"
 log_error "Install it with: brew install jq"
 log_error "If Homebrew is not available: https://jqlang.github.io/jq/download/"
 return 1
 fi
}

_install_jq_apt() {
 sudo apt-get update -qq && sudo apt-get install -y jq || {
 log_error "Failed to install jq via apt. Run 'sudo apt-get install -y jq' manually."
 return 1
 }
}

_install_jq_dnf() {
 sudo dnf install -y jq || {
 log_error "Failed to install jq via dnf. Run 'sudo dnf install -y jq' manually."
 return 1
 }
}

_install_jq_apk() {
 sudo apk add jq || {
 log_error "Failed to install jq via apk. Run 'sudo apk add jq' manually."
 return 1
 }
}

_report_jq_not_found() {
 log_error "jq is required but not installed"
 log_error ""
 log_error "Install jq for your system:"
 log_error " Ubuntu/Debian: sudo apt-get install -y jq"
 log_error " Fedora/RHEL: sudo dnf install -y jq"
 log_error " macOS: brew install jq"
 log_error " Other: https://jqlang.github.io/jq/download/"
}

ensure_jq() {
 if command -v jq &>/dev/null; then
 return 0
Expand All@@ -121,28 +164,15 @@ ensure_jq() {
 log_step "Installing jq..."

 if [[ "$OSTYPE" == "darwin"* ]]; then
 if command -v brew &>/dev/null; then
 brew install jq || { log_error "Failed to install jq via Homebrew. Run 'brew install jq' manually."; return 1; }
 else
 log_error "jq is required but not installed"
 log_error "Install it with: brew install jq"
 log_error "If Homebrew is not available: https://jqlang.github.io/jq/download/"
 return 1
 fi
 _install_jq_brew || return 1
 elif command -v apt-get &>/dev/null; then
sudo apt-get update -qq && sudo apt-get install -y jq || { log_error "Failed to install jq via apt. Run 'sudo apt-get install -y jq' manually."; return 1; }
_install_jq_apt || return 1
 elif command -v dnf &>/dev/null; then
sudo dnf install -y jq || { log_error "Failed to install jq via dnf. Run 'sudo dnf install -y jq' manually."; return 1; }
_install_jq_dnf || return 1
 elif command -v apk &>/dev/null; then
sudo apk add jq || { log_error "Failed to install jq via apk. Run 'sudo apk add jq' manually."; return 1; }
_install_jq_apk || return 1
 else
 log_error "jq is required but not installed"
 log_error ""
 log_error "Install jq for your system:"
 log_error " Ubuntu/Debian: sudo apt-get install -y jq"
 log_error " Fedora/RHEL: sudo dnf install -y jq"
 log_error " macOS: brew install jq"
 log_error " Other: https://jqlang.github.io/jq/download/"
 _report_jq_not_found
 return 1
 fi

Expand Down

115 changes: 75 additions & 40 deletions
shared/github-auth.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,44 @@ fi
# ensure_gh_cli — Install gh CLI if not already present
# ============================================================

# Install gh via Homebrew (macOS)
_install_gh_brew() {
 if command -v brew &>/dev/null; then
 brew install gh || {
 log_error "Failed to install gh via Homebrew"
 return 1
 }
 else
 log_error "Homebrew not found. Install Homebrew first: https://brew.sh"
 log_error "Then run: brew install gh"
 return 1
 fi
}

# Install gh via APT with GitHub's official repository (Debian/Ubuntu)
_install_gh_apt() {
 log_step "Adding GitHub CLI APT repository..."
 curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
 | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg 2>/dev/null
 sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg
 printf 'deb [arch=%s signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\n' \
 "$(dpkg --print-architecture)" \
 | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
 sudo apt-get update -qq
 sudo apt-get install -y gh || {
 log_error "Failed to install gh via apt"
 return 1
 }
}

# Install gh via DNF (Fedora/RHEL)
_install_gh_dnf() {
 sudo dnf install -y gh || {
 log_error "Failed to install gh via dnf"
 return 1
 }
}

ensure_gh_cli() {
 if command -v gh &>/dev/null; then
 log_info "GitHub CLI (gh) available: $(gh --version | head -1)"
Expand All@@ -42,44 +80,16 @@ ensure_gh_cli() {
 log_step "Installing GitHub CLI (gh)..."

 if [[ "$OSTYPE" == "darwin"* ]]; then
 # macOS — require Homebrew
 if command -v brew &>/dev/null; then
 brew install gh || {
 log_error "Failed to install gh via Homebrew"
 return 1
 }
 else
 log_error "Homebrew not found. Install Homebrew first: https://brew.sh"
 log_error "Then run: brew install gh"
 return 1
 fi
 _install_gh_brew || return 1
 elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
 if command -v apt-get &>/dev/null; then
 # Debian/Ubuntu — add GitHub's official APT repo
 log_step "Adding GitHub CLI APT repository..."
 curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
 | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg 2>/dev/null
 sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg
 printf 'deb [arch=%s signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\n' \
 "$(dpkg --print-architecture)" \
 | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
 sudo apt-get update -qq
 sudo apt-get install -y gh || {
 log_error "Failed to install gh via apt"
 return 1
 }
 _install_gh_apt || return 1
 elif command -v dnf &>/dev/null; then
 # Fedora/RHEL
 sudo dnf install -y gh || {
 log_error "Failed to install gh via dnf"
 return 1
 }
 _install_gh_dnf || return 1
 else
 # Fallback — download prebuilt binary
 _install_gh_binary || return 1
 fi
 else
 # Unknown OS — try binary fallback
 _install_gh_binary || return 1
 fi

Expand All@@ -95,9 +105,9 @@ ensure_gh_cli() {
# Binary fallback installer (non-apt/non-brew systems)
# ============================================================

_install_gh_binary() {
 log_step "Installing gh from GitHub releases (binary fallback)..."

# Detect OS and architecture for binary downloads, outputting "os arch" on stdout.
# Returns 1 with error message if platform is unsupported.
_detect_gh_platform() {
 local os arch gh_os gh_arch
 os="$(uname -s)"
 arch="$(uname -m)"
Expand All@@ -120,7 +130,11 @@ _install_gh_binary() {
 ;;
 esac

 # Get latest release version
 echo "${gh_os} ${gh_arch}"
}

# Fetch the latest gh release version string from GitHub API
_fetch_gh_latest_version() {
 local latest_version
 latest_version=$(curl -fsSL "https://api.github.com/repos/cli/cli/releases/latest" \
 | grep '"tag_name"' | sed 's/.*"v\([^"]*\)".*/\1/') || {
Expand All@@ -133,10 +147,18 @@ _install_gh_binary() {
 return 1
 fi

 log_step "Downloading gh v${latest_version} for ${gh_os}/${gh_arch}..."
 echo "${latest_version}"
}

# Download and extract a gh release tarball into ~/.local/bin
# Usage: _download_and_install_gh VERSION GH_OS GH_ARCH
_download_and_install_gh() {
 local version="${1}" gh_os="${2}" gh_arch="${3}"

 log_step "Downloading gh v${version} for ${gh_os}/${gh_arch}..."

 local tarball="gh_${latest_version}_${gh_os}_${gh_arch}.tar.gz"
 local url="https://github.com/cli/cli/releases/download/v${latest_version}/${tarball}"
 local tarball="gh_${version}_${gh_os}_${gh_arch}.tar.gz"
 local url="https://github.com/cli/cli/releases/download/v${version}/${tarball}"
 local tmpdir
 tmpdir=$(mktemp -d)

Expand All@@ -152,9 +174,8 @@ _install_gh_binary() {
 return 1
 }

 # Install to ~/.local/bin
 mkdir -p "${HOME}/.local/bin"
 cp "${tmpdir}/gh_${latest_version}_${gh_os}_${gh_arch}/bin/gh" "${HOME}/.local/bin/gh"
 cp "${tmpdir}/gh_${version}_${gh_os}_${gh_arch}/bin/gh" "${HOME}/.local/bin/gh"
 chmod +x "${HOME}/.local/bin/gh"
 rm -rf "${tmpdir}"

Expand All@@ -167,6 +188,20 @@ _install_gh_binary() {
 log_info "gh installed to ${HOME}/.local/bin/gh"
}

_install_gh_binary() {
 log_step "Installing gh from GitHub releases (binary fallback)..."

 local platform
 platform=$(_detect_gh_platform) || return 1
 local gh_os gh_arch
 read -r gh_os gh_arch <<< "${platform}"

 local latest_version
 latest_version=$(_fetch_gh_latest_version) || return 1

 _download_and_install_gh "${latest_version}" "${gh_os}" "${gh_arch}"
}

# ============================================================
# ensure_gh_auth — Authenticate with GitHub via gh auth login
# ============================================================
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
refactor: decompose ensure_jq and ensure_gh_cli into focused helpers#994

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

 Merged

louisgv
merged 1 commit into

from

Feb 13, 2026
 Merged


refactor: decompose ensure_jq and ensure_gh_cli into focused helpers
#994
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


66 changes: 48 additions & 18 deletions
shared/common.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,6 +113,49 @@ check_python_available() {
}

# Install jq if not already present (required by some cloud providers)
# Platform-specific jq install helpers
_install_jq_brew() {
 if command -v brew &>/dev/null; then
 brew install jq || { log_error "Failed to install jq via Homebrew. Run 'brew install jq' manually."; return 1; }
 else
 log_error "jq is required but not installed"
 log_error "Install it with: brew install jq"
 log_error "If Homebrew is not available: https://jqlang.github.io/jq/download/"
 return 1
 fi
}

_install_jq_apt() {
 sudo apt-get update -qq && sudo apt-get install -y jq || {
 log_error "Failed to install jq via apt. Run 'sudo apt-get install -y jq' manually."
 return 1
 }
}

_install_jq_dnf() {
 sudo dnf install -y jq || {
 log_error "Failed to install jq via dnf. Run 'sudo dnf install -y jq' manually."
 return 1
 }
}

_install_jq_apk() {
 sudo apk add jq || {
 log_error "Failed to install jq via apk. Run 'sudo apk add jq' manually."
 return 1
 }
}

_report_jq_not_found() {
 log_error "jq is required but not installed"
 log_error ""
 log_error "Install jq for your system:"
 log_error " Ubuntu/Debian: sudo apt-get install -y jq"
 log_error " Fedora/RHEL: sudo dnf install -y jq"
 log_error " macOS: brew install jq"
 log_error " Other: https://jqlang.github.io/jq/download/"
}

ensure_jq() {
 if command -v jq &>/dev/null; then
 return 0
Expand All@@ -121,28 +164,15 @@ ensure_jq() {
 log_step "Installing jq..."

 if [[ "$OSTYPE" == "darwin"* ]]; then
 if command -v brew &>/dev/null; then
 brew install jq || { log_error "Failed to install jq via Homebrew. Run 'brew install jq' manually."; return 1; }
 else
 log_error "jq is required but not installed"
 log_error "Install it with: brew install jq"
 log_error "If Homebrew is not available: https://jqlang.github.io/jq/download/"
 return 1
 fi
 _install_jq_brew || return 1
 elif command -v apt-get &>/dev/null; then
sudo apt-get update -qq && sudo apt-get install -y jq || { log_error "Failed to install jq via apt. Run 'sudo apt-get install -y jq' manually."; return 1; }
_install_jq_apt || return 1
 elif command -v dnf &>/dev/null; then
sudo dnf install -y jq || { log_error "Failed to install jq via dnf. Run 'sudo dnf install -y jq' manually."; return 1; }
_install_jq_dnf || return 1
 elif command -v apk &>/dev/null; then
sudo apk add jq || { log_error "Failed to install jq via apk. Run 'sudo apk add jq' manually."; return 1; }
_install_jq_apk || return 1
 else
 log_error "jq is required but not installed"
 log_error ""
 log_error "Install jq for your system:"
 log_error " Ubuntu/Debian: sudo apt-get install -y jq"
 log_error " Fedora/RHEL: sudo dnf install -y jq"
 log_error " macOS: brew install jq"
 log_error " Other: https://jqlang.github.io/jq/download/"
 _report_jq_not_found
 return 1
 fi

Expand Down

115 changes: 75 additions & 40 deletions
shared/github-auth.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,44 @@ fi
# ensure_gh_cli — Install gh CLI if not already present
# ============================================================

# Install gh via Homebrew (macOS)
_install_gh_brew() {
 if command -v brew &>/dev/null; then
 brew install gh || {
 log_error "Failed to install gh via Homebrew"
 return 1
 }
 else
 log_error "Homebrew not found. Install Homebrew first: https://brew.sh"
 log_error "Then run: brew install gh"
 return 1
 fi
}

# Install gh via APT with GitHub's official repository (Debian/Ubuntu)
_install_gh_apt() {
 log_step "Adding GitHub CLI APT repository..."
 curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
 | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg 2>/dev/null
 sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg
 printf 'deb [arch=%s signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\n' \
 "$(dpkg --print-architecture)" \
 | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
 sudo apt-get update -qq
 sudo apt-get install -y gh || {
 log_error "Failed to install gh via apt"
 return 1
 }
}

# Install gh via DNF (Fedora/RHEL)
_install_gh_dnf() {
 sudo dnf install -y gh || {
 log_error "Failed to install gh via dnf"
 return 1
 }
}

ensure_gh_cli() {
 if command -v gh &>/dev/null; then
 log_info "GitHub CLI (gh) available: $(gh --version | head -1)"
Expand All@@ -42,44 +80,16 @@ ensure_gh_cli() {
 log_step "Installing GitHub CLI (gh)..."

 if [[ "$OSTYPE" == "darwin"* ]]; then
 # macOS — require Homebrew
 if command -v brew &>/dev/null; then
 brew install gh || {
 log_error "Failed to install gh via Homebrew"
 return 1
 }
 else
 log_error "Homebrew not found. Install Homebrew first: https://brew.sh"
 log_error "Then run: brew install gh"
 return 1
 fi
 _install_gh_brew || return 1
 elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
 if command -v apt-get &>/dev/null; then
 # Debian/Ubuntu — add GitHub's official APT repo
 log_step "Adding GitHub CLI APT repository..."
 curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
 | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg 2>/dev/null
 sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg
 printf 'deb [arch=%s signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\n' \
 "$(dpkg --print-architecture)" \
 | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
 sudo apt-get update -qq
 sudo apt-get install -y gh || {
 log_error "Failed to install gh via apt"
 return 1
 }
 _install_gh_apt || return 1
 elif command -v dnf &>/dev/null; then
 # Fedora/RHEL
 sudo dnf install -y gh || {
 log_error "Failed to install gh via dnf"
 return 1
 }
 _install_gh_dnf || return 1
 else
 # Fallback — download prebuilt binary
 _install_gh_binary || return 1
 fi
 else
 # Unknown OS — try binary fallback
 _install_gh_binary || return 1
 fi

Expand All@@ -95,9 +105,9 @@ ensure_gh_cli() {
# Binary fallback installer (non-apt/non-brew systems)
# ============================================================

_install_gh_binary() {
 log_step "Installing gh from GitHub releases (binary fallback)..."

# Detect OS and architecture for binary downloads, outputting "os arch" on stdout.
# Returns 1 with error message if platform is unsupported.
_detect_gh_platform() {
 local os arch gh_os gh_arch
 os="$(uname -s)"
 arch="$(uname -m)"
Expand All@@ -120,7 +130,11 @@ _install_gh_binary() {
 ;;
 esac

 # Get latest release version
 echo "${gh_os} ${gh_arch}"
}

# Fetch the latest gh release version string from GitHub API
_fetch_gh_latest_version() {
 local latest_version
 latest_version=$(curl -fsSL "https://api.github.com/repos/cli/cli/releases/latest" \
 | grep '"tag_name"' | sed 's/.*"v\([^"]*\)".*/\1/') || {
Expand All@@ -133,10 +147,18 @@ _install_gh_binary() {
 return 1
 fi

 log_step "Downloading gh v${latest_version} for ${gh_os}/${gh_arch}..."
 echo "${latest_version}"
}

# Download and extract a gh release tarball into ~/.local/bin
# Usage: _download_and_install_gh VERSION GH_OS GH_ARCH
_download_and_install_gh() {
 local version="${1}" gh_os="${2}" gh_arch="${3}"

 log_step "Downloading gh v${version} for ${gh_os}/${gh_arch}..."

 local tarball="gh_${latest_version}_${gh_os}_${gh_arch}.tar.gz"
 local url="https://github.com/cli/cli/releases/download/v${latest_version}/${tarball}"
 local tarball="gh_${version}_${gh_os}_${gh_arch}.tar.gz"
 local url="https://github.com/cli/cli/releases/download/v${version}/${tarball}"
 local tmpdir
 tmpdir=$(mktemp -d)

Expand All@@ -152,9 +174,8 @@ _install_gh_binary() {
 return 1
 }

 # Install to ~/.local/bin
 mkdir -p "${HOME}/.local/bin"
 cp "${tmpdir}/gh_${latest_version}_${gh_os}_${gh_arch}/bin/gh" "${HOME}/.local/bin/gh"
 cp "${tmpdir}/gh_${version}_${gh_os}_${gh_arch}/bin/gh" "${HOME}/.local/bin/gh"
 chmod +x "${HOME}/.local/bin/gh"
 rm -rf "${tmpdir}"

Expand All@@ -167,6 +188,20 @@ _install_gh_binary() {
 log_info "gh installed to ${HOME}/.local/bin/gh"
}

_install_gh_binary() {
 log_step "Installing gh from GitHub releases (binary fallback)..."

 local platform
 platform=$(_detect_gh_platform) || return 1
 local gh_os gh_arch
 read -r gh_os gh_arch <<< "${platform}"

 local latest_version
 latest_version=$(_fetch_gh_latest_version) || return 1

 _download_and_install_gh "${latest_version}" "${gh_os}" "${gh_arch}"
}

# ============================================================
# ensure_gh_auth — Authenticate with GitHub via gh auth login
# ============================================================
Expand Down