Author: geissert
Date: 2013-12-02 22:57:19 +0000 (Mon, 02 Dec 2013)
New Revision: 24531
Modified:
bin/gen-DSA
Log:
Some code refactoring
Modified: bin/gen-DSA
===================================================================
--- bin/gen-DSA 2013-12-02 21:20:33 UTC (rev 24530)
+++ bin/gen-DSA 2013-12-02 22:57:19 UTC (rev 24531)
@@ -24,6 +24,9 @@
STABLE=wheezy
TESTING=jessie
+NAME_SPACING=24
+DATE_SPACING=22
+
export LANG=C
[ -f doc/DSA.template ] || {
@@ -59,6 +62,36 @@
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 @@
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
_______________________________________________
Secure-testing-commits mailing list
Secure-testing-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/secure-testing-commits
