summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDubiousjim <dubiousjim@gmail.com>2013-07-05 00:21:14 -0400
committerNatanael Copa <ncopa@alpinelinux.org>2013-07-09 06:39:37 +0000
commit42b0e019b92aeca430c06cb25a25bc222d8defa1 (patch)
tree063a86a847b1ef6b8eb32561424412f4736b6989
parent811a215018b84a14218c0184234e6af5f56d10e4 (diff)
downloadabuild-42b0e019b92aeca430c06cb25a25bc222d8defa1.tar.gz
abuild-42b0e019b92aeca430c06cb25a25bc222d8defa1.tar.bz2
abuild-42b0e019b92aeca430c06cb25a25bc222d8defa1.tar.xz
abuild-42b0e019b92aeca430c06cb25a25bc222d8defa1.zip
abuild-keygen: refactor
-rw-r--r--abuild-keygen.in119
1 files changed, 61 insertions, 58 deletions
diff --git a/abuild-keygen.in b/abuild-keygen.in
index a095068..3cf5531 100644
--- a/abuild-keygen.in
+++ b/abuild-keygen.in
@@ -22,6 +22,20 @@ msg() {
# ask for privkey unless non-interactive mode
# returns value in global $privkey
get_privkey_file() {
+ emailaddr=${PACKAGER##*<}
+ emailaddr=${emailaddr%%>*}
+
+ # if PACKAGER does not contain a valid email address, then ask git
+ if [ -z "$emailaddr" ] || [ "${emailaddr##*@}" = "$emailaddr" ]; then
+ emailaddr=$(git config --get user.email 2>/dev/null)
+ fi
+
+ if [ -n "$emailaddr" ]; then
+ default_name="$emailaddr-$(printf "%x" $(date +%s))"
+ else
+ default_name="$USER-$(printf "%x" $(date +%s))"
+ fi
+
privkey="$abuild_home/$default_name.rsa"
[ "$non_interactive" = "yes" ] && return 0
echo "Generating public/private rsa key pair for abuild"
@@ -33,6 +47,52 @@ get_privkey_file() {
fi
}
+do_keygen() {
+ mkdir -p "$abuild_home"
+
+ get_privkey_file
+ pubkey="$privkey.pub"
+
+ # generate the private key in a subshell with stricter umask
+ (
+ umask 0007
+ openssl genrsa -out "$privkey" 2048
+ )
+ openssl rsa -in "$privkey" -pubout -out "$pubkey"
+
+
+ if [ -n "$install_pubkey" ]; then
+ msg "Installing $pubkey to /etc/apk/keys..."
+ sudo mkdir -p /etc/apk/keys
+ sudo cp -i "$pubkey" /etc/apk/keys/
+ else
+
+ msg ""
+ msg "You'll need to install $pubkey into "
+ msg "/etc/apk/keys to be able to install packages and repositories signed with"
+ msg "$privkey"
+ fi
+
+ if [ -n "$append_config" ]; then
+ if [ -f "$abuild_userconf" ]; then
+ # comment out the existing values
+ sed -i -e 's/^\(PACKAGER_PRIVKEY=.*\)/\#\1/' "$abuild_userconf"
+ fi
+ echo "PACKAGER_PRIVKEY=\"$privkey\"" >> "$abuild_userconf"
+ else
+ msg ""
+ msg "You might want add following line to $abuild_userconf:"
+ msg ""
+ msg "PACKAGER_PRIVKEY=\"$privkey\""
+ msg ""
+ fi
+
+ 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"
@@ -53,20 +113,6 @@ usage() {
# read user config if exists
[ -f "$abuild_userconf" ] && . "$abuild_userconf"
-emailaddr=${PACKAGER##*<}
-emailaddr=${emailaddr%%>*}
-
-# if PACKAGER does not contain a valid email address, then ask git
-if [ -z "$emailaddr" ] || [ "${emailaddr##*@}" = "$emailaddr" ]; then
- emailaddr=$(git config --get user.email 2>/dev/null)
-fi
-
-if [ -n "$emailaddr" ]; then
- default_name="$emailaddr-$(printf "%x" $(date +%s))"
-else
- default_name="$USER-$(printf "%x" $(date +%s))"
-fi
-
while getopts "ahinq" opt; do
case $opt in
a) append_config=yes;;
@@ -78,47 +124,4 @@ while getopts "ahinq" opt; do
done
shift $(( $OPTIND - 1))
-mkdir -p "$abuild_home"
-
-get_privkey_file
-pubkey="$privkey.pub"
-
-# generate the private key in a subshell with stricter umask
-(
-umask 0007
-openssl genrsa -out "$privkey" 2048
-)
-openssl rsa -in "$privkey" -pubout -out "$pubkey"
-
-
-if [ -n "$install_pubkey" ]; then
- msg "Installing $pubkey to /etc/apk/keys..."
- sudo mkdir -p /etc/apk/keys
- sudo cp -i "$pubkey" /etc/apk/keys/
-else
-
- msg ""
- msg "You'll need to install $pubkey into "
- msg "/etc/apk/keys to be able to install packages and repositories signed with"
- msg "$privkey"
-fi
-
-if [ -n "$append_config" ]; then
- if [ -f "$abuild_userconf" ]; then
- # comment out the existing values
- sed -i -e 's/^\(PACKAGER_PRIVKEY=.*\)/\#\1/' "$abuild_userconf"
- fi
- echo "PACKAGER_PRIVKEY=\"$privkey\"" >> "$abuild_userconf"
-else
- msg ""
- msg "You might want add following line to $abuild_userconf:"
- msg ""
- msg "PACKAGER_PRIVKEY=\"$privkey\""
- msg ""
-fi
-
-msg ""
-msg "Please remember to make a safe backup of your private key:"
-msg "$privkey"
-msg ""
-
+do_keygen