Some code refactoring

git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@24531 e39458fd-73e7-0310-bf30-c45bca0a0e42

1 files changed, 35 insertions, 14 deletions

diff --git a/bin/gen-DSA b/bin/gen-DSA
index 9264b4f631..3c4de4e2e5 100755
--- a/bin/gen-DSA
+++ b/bin/gen-DSA
@@ -24,6 +24,9 @@ OLDSTABLE=squeeze
 STABLE=wheezy
 TESTING=jessie
 
+NAME_SPACING=24
+DATE_SPACING=22
+
 export LANG=C
 
 [ -f doc/DSA.template ] || {
@@ -59,6 +62,36 @@ split_n_sort() {
     sort -n | tr "\n" ' ' | sed -r 's/\s+/ /g;s/\s$//'
 }
 
+_d_space() {
+    local direction="$1" text="$2" to_length="$3"
+    local right='' left='' output='' spacing=0
+
+    if [ "$direction" = 'right' ]; then
+	right=' '
+    elif [ "$direction" = 'left' ]; then
+	left=' '
+    else
+	echo FIXME >&2
+	exit 1
+    fi
+
+    spacing=$(($to_length-${#text}))
+    output="$text"
+    while [ $spacing -gt 0 ]; do
+	output="${left}${output}${right}"
+	spacing=$((spacing-1))
+    done
+    printf '%s' "$output"
+}
+
+left_space() {
+    _d_space left "$@"
+}
+
+right_space() {
+    _d_space right "$@"
+}
+
 warn() {
     printf "${YELLOW}warning:${NORMAL} %s\n" "$1"
 }
@@ -272,22 +305,10 @@ if [ $REFERENCES -gt 1 ]; then
     sed -ri 's/this problem has/these problems have/' $tmpf
 fi
 
-name_length=${#DEBFULLNAME}
-spacing=$((24-$name_length))
-SPACEDDEBFULLNAME="$DEBFULLNAME"
-while [ $spacing -gt 0 ]; do
-    SPACEDDEBFULLNAME=" $SPACEDDEBFULLNAME"
-    spacing=$((spacing-1))
-done
+SPACEDDEBFULLNAME="$(left_space "$DEBFULLNAME" "$NAME_SPACING")"
 
 DATE="$(date +"%B %d, %Y")"
-date_length=${#DATE}
-spacing=$((22-$date_length))
-SPACEDDATE="$DATE"
-while [ $spacing -gt 0 ]; do
-    SPACEDDATE="$SPACEDDATE "
-    spacing=$((spacing-1))
-done
+SPACEDDATE="$(right_space "$DATE" "$DATE_SPACING")"
 
 setvar DEBEMAIL
 setvar DEBFULLNAME