fix subdir and hopefully gpg decrypt

This commit is contained in:
LuKe Tidd 2022-12-13 11:38:32 -05:00
parent 7eec287f83
commit fd4d901890
Signed by: luke
GPG Key ID: 75D6600BEF4E8E8F
3 changed files with 9 additions and 9 deletions

6
gclone
View File

@ -1,5 +1,4 @@
#!/bin/bash
if [[ -z "$1" ]]; then
printf 'Need a project:\n\n' >&2
pass show gitea/token >&2
@ -12,7 +11,7 @@ shift
token="$(pass show gitea/token/${project})"
if [[ -z "$token" ]]; then
printf 'Failed to get token for %s. ' "$project" >&2
printf 'Must be one of:\n\n' "$project" >&2
printf 'Must be one of:\n\n' >&2
pass show gitea/token >&2
exit 1
fi
@ -27,8 +26,9 @@ else
readarray -t out <<< "$(git clone "$token_url" 2>&1)"
new_dir="$(awk -F\' '{print $2}' <<< "$out")"
cd "$new_dir"
git config user.signingkey "$gpg_key"!
git config commit.gpgsign true
git remote remove origin
git push --set-upstream "$url" main
GPG_TTY=$(tty) git push --set-upstream "$url" main
fi

4
gpull
View File

@ -9,7 +9,7 @@ fi
token="$(pass show gitea/token/${project})"
if [[ -z "$token" ]]; then
printf 'Failed to get token for %s. ' "$project" >&2
printf 'Must be one of:\n\n' "$project" >&2
printf 'Must be one of:\n\n' >&2
pass show gitea/token >&2
exit 1
fi
@ -22,5 +22,5 @@ if [[ "$project" == 'pass' ]]; then
else
git config user.signingkey "$gpg_key"!
git config commit.gpgsign true
git pull "$url"
GPG_TTY=$(tty) git pull "$url"
fi

8
gpush
View File

@ -9,7 +9,7 @@ fi
token="$(pass show gitea/token/${project})"
if [[ -z "$token" ]]; then
printf 'Failed to get token for %s. ' "$project" >&2
printf 'Must be one of:\n\n' "$project" >&2
printf 'Must be one of:\n\n' >&2
pass show gitea/token >&2
exit 1
fi
@ -21,14 +21,14 @@ if [[ "$project" == 'pass' ]]; then
pass git push "$url"
if [[ $? != 0 ]]; then
printf 'no upstream. setting..\n' >&2
git push --set-upstream "$url" main
GPG_TTY=$(tty) git push --set-upstream "$url" main
fi
else
git config user.signingkey "$gpg_key"!
git config commit.gpgsign true
git push "$url"
GPG_TTY=$(tty) git push "$url"
if [[ $? != 0 ]]; then
printf 'no upstream. setting..\n' >&2
git push --set-upstream "$url" main
GPG_TTY=$(tty) git push --set-upstream "$url" main
fi
fi