mirror of
https://gitlab.archlinux.org/archlinux/devtools.git
synced 2025-09-14 10:26:18 +02:00
Compare commits
1 Commits
3a30ff9fe9
...
make-warni
Author | SHA1 | Date | |
---|---|---|---|
![]() |
287d2b4064 |
@@ -150,7 +150,6 @@ _pkgctl_cmds=(
|
|||||||
db
|
db
|
||||||
diff
|
diff
|
||||||
issue
|
issue
|
||||||
license
|
|
||||||
release
|
release
|
||||||
repo
|
repo
|
||||||
search
|
search
|
||||||
|
@@ -123,10 +123,9 @@ fi
|
|||||||
needsversioning=()
|
needsversioning=()
|
||||||
|
|
||||||
if [[ ! -e REUSE.toml || ! -e LICENSE || ! -d LICENSES ]]; then
|
if [[ ! -e REUSE.toml || ! -e LICENSE || ! -d LICENSES ]]; then
|
||||||
# TODO: Make this a hard failure in the future after packagers have had
|
error "package doesn't have proper licensing information, set it up using:"
|
||||||
# some time to add licenses to all packages.
|
|
||||||
warning "package doesn't have proper licensing information, set it up using:"
|
|
||||||
msg2 'pkgctl license setup'
|
msg2 'pkgctl license setup'
|
||||||
|
exit 1
|
||||||
else
|
else
|
||||||
pkgctl license check
|
pkgctl license check
|
||||||
needsversioning+=(REUSE.toml LICENSE LICENSES/*)
|
needsversioning+=(REUSE.toml LICENSE LICENSES/*)
|
||||||
@@ -155,7 +154,7 @@ if (( ${#needsversioning[*]} )); then
|
|||||||
if [[ ! -f "${file}" ]]; then
|
if [[ ! -f "${file}" ]]; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
if ! git ls-files --error-unmatch "$file" >/dev/null; then
|
if ! git ls-files --error-unmatch "$file"; then
|
||||||
die "%s is not under version control" "$file"
|
die "%s is not under version control" "$file"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
@@ -33,13 +33,11 @@ pkgctl_auth_login_usage() {
|
|||||||
|
|
||||||
OPTIONS
|
OPTIONS
|
||||||
-g, --gen-access-token Open the URL to generate a new personal access token
|
-g, --gen-access-token Open the URL to generate a new personal access token
|
||||||
-s, --gen-ssh-token Directly generate the token via SSH (only works if your gitlab is already configured with SSH)
|
|
||||||
-h, --help Show this help text
|
-h, --help Show this help text
|
||||||
|
|
||||||
EXAMPLES
|
EXAMPLES
|
||||||
$ ${COMMAND}
|
$ ${COMMAND}
|
||||||
$ ${COMMAND} --gen-access-token
|
$ ${COMMAND} --gen-access-token
|
||||||
$ ${COMMAND} --gen-ssh-token
|
|
||||||
_EOF_
|
_EOF_
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -55,10 +53,6 @@ pkgctl_auth_login() {
|
|||||||
pkgctl_auth_login_usage
|
pkgctl_auth_login_usage
|
||||||
exit 0
|
exit 0
|
||||||
;;
|
;;
|
||||||
-s|--gen-ssh-token)
|
|
||||||
USE_SSH=1
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
-g|--gen-access-token)
|
-g|--gen-access-token)
|
||||||
GEN_ACESS_TOKEN=1
|
GEN_ACESS_TOKEN=1
|
||||||
shift
|
shift
|
||||||
@@ -82,25 +76,17 @@ pkgctl_auth_login() {
|
|||||||
environment variable using a vault, see pkgctl-auth-login(1) for details.
|
environment variable using a vault, see pkgctl-auth-login(1) for details.
|
||||||
_EOF_
|
_EOF_
|
||||||
|
|
||||||
if (( USE_SSH )); then
|
|
||||||
token=$(ssh git@gitlab.archlinux.org personal_access_token pkgctl api,write_repository 30)
|
|
||||||
if [[ $? -ne 0 ]]; then
|
|
||||||
msg_error " Failed to generate token via SSH"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
token=$(echo "$token" | grep 'Token:' | awk '{print $2}')
|
|
||||||
fi
|
|
||||||
|
|
||||||
if (( GEN_ACESS_TOKEN )); then
|
if (( GEN_ACESS_TOKEN )); then
|
||||||
xdg-open "${personal_access_token_url}" 2>/dev/null
|
xdg-open "${personal_access_token_url}" 2>/dev/null
|
||||||
# read token from stdin
|
fi
|
||||||
read -s -r -p "${GREEN}?${ALL_OFF} ${BOLD}Paste your authentication token:${ALL_OFF} " token
|
|
||||||
echo
|
|
||||||
|
|
||||||
if [[ -z ${token} ]]; then
|
# read token from stdin
|
||||||
msg_error " No token provided"
|
read -s -r -p "${GREEN}?${ALL_OFF} ${BOLD}Paste your authentication token:${ALL_OFF} " token
|
||||||
exit 1
|
echo
|
||||||
fi
|
|
||||||
|
if [[ -z ${token} ]]; then
|
||||||
|
msg_error " No token provided"
|
||||||
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# check if the passed token works
|
# check if the passed token works
|
||||||
|
@@ -188,13 +188,10 @@ path = [
|
|||||||
"README.md",
|
"README.md",
|
||||||
"keys/**",
|
"keys/**",
|
||||||
".SRCINFO",
|
".SRCINFO",
|
||||||
".gitignore",
|
|
||||||
".nvchecker.toml",
|
".nvchecker.toml",
|
||||||
"*.install",
|
"*.install",
|
||||||
"*.sysusers",
|
"*.sysusers",
|
||||||
"*sysusers.conf",
|
|
||||||
"*.tmpfiles",
|
"*.tmpfiles",
|
||||||
"*tmpfiles.conf",
|
|
||||||
"*.logrotate",
|
"*.logrotate",
|
||||||
"*.pam",
|
"*.pam",
|
||||||
"*.service",
|
"*.service",
|
||||||
|
Reference in New Issue
Block a user