From bca3dc035b61c9af6a6ca90f5a369dfbf5b2c610 Mon Sep 17 00:00:00 2001 From: Garret Patten Date: Fri, 15 May 2026 17:18:04 -0400 Subject: [PATCH 1/4] fix bugs --- code-backup/code-backup-local.sh | 6 +++--- tmux/test_fail.sh | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 tmux/test_fail.sh diff --git a/code-backup/code-backup-local.sh b/code-backup/code-backup-local.sh index aed0fa4..2718099 100755 --- a/code-backup/code-backup-local.sh +++ b/code-backup/code-backup-local.sh @@ -7,11 +7,11 @@ set -euo pipefail # Configuration -readonly SCRIPT_DIR SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) +readonly SCRIPT_DIR readonly LOG_DIR="$SCRIPT_DIR/logs" -readonly RUN_TS RUN_TS=$(date +%Y%m%d-%H%M%S) +readonly RUN_TS readonly LOG_FILE="$LOG_DIR/code-backup-$RUN_TS.log" readonly ERROR_LOG="$LOG_DIR/errors-$RUN_TS.log" @@ -25,8 +25,8 @@ GITHUB_USERNAME="${GITHUB_USERNAME:-}" USE_GITHUB_SSH="${USE_GITHUB_SSH:-false}" # Backup directory will be created with date format -readonly BACKUP_DATE BACKUP_DATE=$(date +%m-%d-%y) +readonly BACKUP_DATE readonly BACKUP_DIR_NAME="Code-Backup_${BACKUP_DATE}" readonly BACKUP_DIR="$HOME/$BACKUP_DIR_NAME" readonly PROJECTS_DIR="$BACKUP_DIR" diff --git a/tmux/test_fail.sh b/tmux/test_fail.sh new file mode 100644 index 0000000..b6dfdda --- /dev/null +++ b/tmux/test_fail.sh @@ -0,0 +1 @@ +readonly VAR; VAR="hello"; echo $VAR From 794e5873dac13c2024032e8e14f3a69ee54b5dc4 Mon Sep 17 00:00:00 2001 From: Garret Patten Date: Fri, 15 May 2026 17:44:36 -0400 Subject: [PATCH 2/4] fix bugs --- code-backup/code-backup-gitlab.sh | 4 ++-- code-backup/code-backup-local.sh | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code-backup/code-backup-gitlab.sh b/code-backup/code-backup-gitlab.sh index a50de4e..284f22e 100644 --- a/code-backup/code-backup-gitlab.sh +++ b/code-backup/code-backup-gitlab.sh @@ -65,7 +65,7 @@ log() { local level="$1"; shift local msg="$*" local ts; ts="$(date '+%Y-%m-%d %H:%M:%S')" - echo -e "${ts} [${level}] ${msg}" | tee -a "$LOG_FILE" + echo -e "${ts} [${level}] ${msg}" | tee -a "$LOG_FILE" >&2 } log_info() { log "INFO" "${BLUE}$*${NC}"; } @@ -279,7 +279,7 @@ process_repo() { local effective_clone_url="$clone_url" if [ "$USE_GITHUB_SSH" != "true" ] && [ -n "${GITHUB_TOKEN:-}" ]; then # GitHub supports token auth via x-access-token username. - effective_clone_url="${clone_url//https:\/\//https:\/\/x-access-token:${GITHUB_TOKEN}@\/}" + effective_clone_url="${clone_url//https:\/\//https:\/\/x-access-token:${GITHUB_TOKEN}@}" fi # Clone/update local mirror diff --git a/code-backup/code-backup-local.sh b/code-backup/code-backup-local.sh index 2718099..88ffe45 100755 --- a/code-backup/code-backup-local.sh +++ b/code-backup/code-backup-local.sh @@ -49,7 +49,7 @@ log() { local message="$*" local timestamp timestamp=$(date '+%Y-%m-%d %H:%M:%S') - echo -e "${timestamp} [${level}] ${message}" | tee -a "$LOG_FILE" + echo -e "${timestamp} [${level}] ${message}" | tee -a "$LOG_FILE" >&2 } log_info() { @@ -197,6 +197,7 @@ get_github_repos() { local count count="$(echo "$lines" | wc -l | tr -d ' ')" + echo "$lines" if [ "$count" -lt "$per_page" ]; then break fi @@ -264,7 +265,7 @@ clone_repository() { local effective_clone_url="$repo_url" if [ "$USE_GITHUB_SSH" != "true" ] && [ -n "${GITHUB_TOKEN:-}" ]; then - effective_clone_url="${repo_url//https:\/\//https:\/\/x-access-token:${GITHUB_TOKEN}@\/}" + effective_clone_url="${repo_url//https:\/\//https:\/\/x-access-token:${GITHUB_TOKEN}@}" fi if git clone "$effective_clone_url" "$repo_path" 2>>"$ERROR_LOG"; then @@ -285,9 +286,11 @@ clone_repository() { fi cd "$original_dir" 2>/dev/null || true fi + return 0 else log_error "Failed to clone: $repo_name" ((FAILED_REPOS++)) + return 1 fi } From d7703f8a20341953d124ea89de4a62d4deec54a1 Mon Sep 17 00:00:00 2001 From: Garret Patten Date: Fri, 15 May 2026 17:51:24 -0400 Subject: [PATCH 3/4] fix bugs --- code-backup/code-backup-gitlab.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code-backup/code-backup-gitlab.sh b/code-backup/code-backup-gitlab.sh index 284f22e..d3fe023 100644 --- a/code-backup/code-backup-gitlab.sh +++ b/code-backup/code-backup-gitlab.sh @@ -10,13 +10,11 @@ set -euo pipefail # ---------------------------- # Configuration # ---------------------------- -readonly SCRIPT_DIR -SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) +readonly SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) readonly LOG_DIR="$SCRIPT_DIR/logs" mkdir -p "$LOG_DIR" -readonly RUN_TS -RUN_TS=$( date +%Y%m%d-%H%M%S ) +readonly RUN_TS=$( date +%Y%m%d-%H%M%S ) readonly LOG_FILE="$LOG_DIR/gh-gl-backup-$RUN_TS.log" readonly ERROR_LOG="$LOG_DIR/gh-gl-errors-$RUN_TS.log" From 3aabbf24e5e5fade1b9c657e0e91c0b6a0184aa7 Mon Sep 17 00:00:00 2001 From: Garret Patten Date: Fri, 15 May 2026 17:54:06 -0400 Subject: [PATCH 4/4] fix bugs --- code-backup/code-backup-gitlab.sh | 6 ++++-- tmux/test_fail.sh | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 tmux/test_fail.sh diff --git a/code-backup/code-backup-gitlab.sh b/code-backup/code-backup-gitlab.sh index d3fe023..af84091 100644 --- a/code-backup/code-backup-gitlab.sh +++ b/code-backup/code-backup-gitlab.sh @@ -10,11 +10,13 @@ set -euo pipefail # ---------------------------- # Configuration # ---------------------------- -readonly SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) +SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) +readonly SCRIPT_DIR readonly LOG_DIR="$SCRIPT_DIR/logs" mkdir -p "$LOG_DIR" -readonly RUN_TS=$( date +%Y%m%d-%H%M%S ) +RUN_TS=$( date +%Y%m%d-%H%M%S ) +readonly RUN_TS readonly LOG_FILE="$LOG_DIR/gh-gl-backup-$RUN_TS.log" readonly ERROR_LOG="$LOG_DIR/gh-gl-errors-$RUN_TS.log" diff --git a/tmux/test_fail.sh b/tmux/test_fail.sh deleted file mode 100644 index b6dfdda..0000000 --- a/tmux/test_fail.sh +++ /dev/null @@ -1 +0,0 @@ -readonly VAR; VAR="hello"; echo $VAR