fix subdir and hopefully gpg decrypt
This commit is contained in:
6
gclone
6
gclone
@@ -1,5 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
if [[ -z "$1" ]]; then
|
if [[ -z "$1" ]]; then
|
||||||
printf 'Need a project:\n\n' >&2
|
printf 'Need a project:\n\n' >&2
|
||||||
pass show gitea/token >&2
|
pass show gitea/token >&2
|
||||||
@@ -12,7 +11,7 @@ shift
|
|||||||
token="$(pass show gitea/token/${project})"
|
token="$(pass show gitea/token/${project})"
|
||||||
if [[ -z "$token" ]]; then
|
if [[ -z "$token" ]]; then
|
||||||
printf 'Failed to get token for %s. ' "$project" >&2
|
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
|
pass show gitea/token >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
@@ -27,8 +26,9 @@ else
|
|||||||
readarray -t out <<< "$(git clone "$token_url" 2>&1)"
|
readarray -t out <<< "$(git clone "$token_url" 2>&1)"
|
||||||
new_dir="$(awk -F\' '{print $2}' <<< "$out")"
|
new_dir="$(awk -F\' '{print $2}' <<< "$out")"
|
||||||
cd "$new_dir"
|
cd "$new_dir"
|
||||||
|
|
||||||
git config user.signingkey "$gpg_key"!
|
git config user.signingkey "$gpg_key"!
|
||||||
git config commit.gpgsign true
|
git config commit.gpgsign true
|
||||||
git remote remove origin
|
git remote remove origin
|
||||||
git push --set-upstream "$url" main
|
GPG_TTY=$(tty) git push --set-upstream "$url" main
|
||||||
fi
|
fi
|
||||||
|
4
gpull
4
gpull
@@ -9,7 +9,7 @@ fi
|
|||||||
token="$(pass show gitea/token/${project})"
|
token="$(pass show gitea/token/${project})"
|
||||||
if [[ -z "$token" ]]; then
|
if [[ -z "$token" ]]; then
|
||||||
printf 'Failed to get token for %s. ' "$project" >&2
|
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
|
pass show gitea/token >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
@@ -22,5 +22,5 @@ if [[ "$project" == 'pass' ]]; then
|
|||||||
else
|
else
|
||||||
git config user.signingkey "$gpg_key"!
|
git config user.signingkey "$gpg_key"!
|
||||||
git config commit.gpgsign true
|
git config commit.gpgsign true
|
||||||
git pull "$url"
|
GPG_TTY=$(tty) git pull "$url"
|
||||||
fi
|
fi
|
||||||
|
8
gpush
8
gpush
@@ -9,7 +9,7 @@ fi
|
|||||||
token="$(pass show gitea/token/${project})"
|
token="$(pass show gitea/token/${project})"
|
||||||
if [[ -z "$token" ]]; then
|
if [[ -z "$token" ]]; then
|
||||||
printf 'Failed to get token for %s. ' "$project" >&2
|
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
|
pass show gitea/token >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
@@ -21,14 +21,14 @@ if [[ "$project" == 'pass' ]]; then
|
|||||||
pass git push "$url"
|
pass git push "$url"
|
||||||
if [[ $? != 0 ]]; then
|
if [[ $? != 0 ]]; then
|
||||||
printf 'no upstream. setting..\n' >&2
|
printf 'no upstream. setting..\n' >&2
|
||||||
git push --set-upstream "$url" main
|
GPG_TTY=$(tty) git push --set-upstream "$url" main
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
git config user.signingkey "$gpg_key"!
|
git config user.signingkey "$gpg_key"!
|
||||||
git config commit.gpgsign true
|
git config commit.gpgsign true
|
||||||
git push "$url"
|
GPG_TTY=$(tty) git push "$url"
|
||||||
if [[ $? != 0 ]]; then
|
if [[ $? != 0 ]]; then
|
||||||
printf 'no upstream. setting..\n' >&2
|
printf 'no upstream. setting..\n' >&2
|
||||||
git push --set-upstream "$url" main
|
GPG_TTY=$(tty) git push --set-upstream "$url" main
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
Reference in New Issue
Block a user