diff --git a/bootstrap.sh b/bootstrap.sh index a89c6b7..0127c73 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -15,10 +15,6 @@ if ! command -v git >/dev/null || ! command -v python3 >/dev/null; then *) echo "Bootstrap package adapter unavailable for $ID." >&2; exit 1 ;; esac fi -read -r -p 'Gitea username: ' CARR_GITEA_USER /dev/tty + read -r -s -p 'Gitea access token (read:repository, private access): ' CARR_GITEA_TOKEN /dev/tty + if [[ -z "$CARR_GITEA_TOKEN" ]]; then + echo 'No token received. Please try again.' >/dev/tty + continue + fi + export CARR_GITEA_USER CARR_GITEA_TOKEN + if git -c credential.helper= clone --no-checkout -- "https://git.carr.pub/$CARR_GITEA_USER/workstation.git" "$carr_stage_dir"; then + echo 'Authenticated repository download succeeded.' >/dev/tty + break + fi + unset CARR_GITEA_TOKEN + echo 'Download failed. Check the account, private repository permission, and network; retry or press Ctrl+C.' >/dev/tty + rm -rf -- "$carr_stage_dir" + carr_stage_dir=$(mktemp -d "$(dirname -- "$carr_checkout")/.carr-clone-XXXXXX") +done git -C "$carr_stage_dir" checkout --detach "$ref" mv -- "$carr_stage_dir" "$carr_checkout" carr_stage_dir=''