abuild-keygen: refactor
This commit is contained in:
parent
811a215018
commit
42b0e019b9
@ -22,37 +22,6 @@ msg() {
|
||||
# ask for privkey unless non-interactive mode
|
||||
# returns value in global $privkey
|
||||
get_privkey_file() {
|
||||
privkey="$abuild_home/$default_name.rsa"
|
||||
[ "$non_interactive" = "yes" ] && return 0
|
||||
echo "Generating public/private rsa key pair for abuild"
|
||||
echo -n "Enter file in which to save the key ($abuild_home/$default_name.rsa): "
|
||||
|
||||
read line
|
||||
if [ -n "$line" ]; then
|
||||
privkey="$line"
|
||||
fi
|
||||
}
|
||||
|
||||
# print usage and exit
|
||||
usage() {
|
||||
echo "abuild-keygen $abuild_ver"
|
||||
echo "usage: abuild-keygen [-ih]"
|
||||
echo "options:"
|
||||
echo " -a Set PACKAGER_PRIVKEY=<generated key> in $abuild_userconf"
|
||||
echo " -i Install public key into /etc/apk/keys using sudo"
|
||||
echo " -h Show this help"
|
||||
echo " -n Non-interactive. Use defaults"
|
||||
echo " -q Quiet mode"
|
||||
echo ""
|
||||
exit 1
|
||||
}
|
||||
|
||||
# read config
|
||||
[ -f "$abuild_conf" ] && . "$abuild_conf"
|
||||
|
||||
# read user config if exists
|
||||
[ -f "$abuild_userconf" ] && . "$abuild_userconf"
|
||||
|
||||
emailaddr=${PACKAGER##*<}
|
||||
emailaddr=${emailaddr%%>*}
|
||||
|
||||
@ -67,17 +36,18 @@ else
|
||||
default_name="$USER-$(printf "%x" $(date +%s))"
|
||||
fi
|
||||
|
||||
while getopts "ahinq" opt; do
|
||||
case $opt in
|
||||
a) append_config=yes;;
|
||||
h) usage;;
|
||||
i) install_pubkey=yes;;
|
||||
n) non_interactive=yes;;
|
||||
q) quiet=-quiet;;
|
||||
esac
|
||||
done
|
||||
shift $(( $OPTIND - 1))
|
||||
privkey="$abuild_home/$default_name.rsa"
|
||||
[ "$non_interactive" = "yes" ] && return 0
|
||||
echo "Generating public/private rsa key pair for abuild"
|
||||
echo -n "Enter file in which to save the key ($abuild_home/$default_name.rsa): "
|
||||
|
||||
read line
|
||||
if [ -n "$line" ]; then
|
||||
privkey="$line"
|
||||
fi
|
||||
}
|
||||
|
||||
do_keygen() {
|
||||
mkdir -p "$abuild_home"
|
||||
|
||||
get_privkey_file
|
||||
@ -121,4 +91,37 @@ msg ""
|
||||
msg "Please remember to make a safe backup of your private key:"
|
||||
msg "$privkey"
|
||||
msg ""
|
||||
}
|
||||
|
||||
# print usage and exit
|
||||
usage() {
|
||||
echo "abuild-keygen $abuild_ver"
|
||||
echo "usage: abuild-keygen [-ih]"
|
||||
echo "options:"
|
||||
echo " -a Set PACKAGER_PRIVKEY=<generated key> in $abuild_userconf"
|
||||
echo " -i Install public key into /etc/apk/keys using sudo"
|
||||
echo " -h Show this help"
|
||||
echo " -n Non-interactive. Use defaults"
|
||||
echo " -q Quiet mode"
|
||||
echo ""
|
||||
exit 1
|
||||
}
|
||||
|
||||
# read config
|
||||
[ -f "$abuild_conf" ] && . "$abuild_conf"
|
||||
|
||||
# read user config if exists
|
||||
[ -f "$abuild_userconf" ] && . "$abuild_userconf"
|
||||
|
||||
while getopts "ahinq" opt; do
|
||||
case $opt in
|
||||
a) append_config=yes;;
|
||||
h) usage;;
|
||||
i) install_pubkey=yes;;
|
||||
n) non_interactive=yes;;
|
||||
q) quiet=-quiet;;
|
||||
esac
|
||||
done
|
||||
shift $(( $OPTIND - 1))
|
||||
|
||||
do_keygen
|
||||
|
Loading…
x
Reference in New Issue
Block a user