diff --git a/include/nixdorf b/include/nixdorf index a7dea34..b377c3c 100755 --- a/include/nixdorf +++ b/include/nixdorf @@ -39,5 +39,17 @@ function italicLetters() { printf "\x1b\x34" >> "$1" } +function makeNewline() { + for((i=0; i<$1; i++)); do + printf "\n" >> "$2" + done +} + +function makeLeft() { + for((i=0; i<$1; i++)); do + printf " " >> "$2" + done +} + init resetLetters $DEVICE diff --git a/jhp/JunghackerPass b/jhp/JunghackerPass index e47b75a..890e84a 100755 --- a/jhp/JunghackerPass +++ b/jhp/JunghackerPass @@ -8,18 +8,6 @@ GIVENNAME=$1 SURNAME=$2 HOME=$3 -function makeNewline() { - for((i=0; i<$1; i++)); do - printf "\n" >> $FILE - done -} - -function makeLeft() { - for((i=0; i<$LEFT; i++)); do - printf " " >> $FILE - done -} - if [ ${#GIVENNAME} -gt $MAXLENGTH ] || [ ${#SURNAME} -gt $MAXLENGTH ] || [ ${#HOME} -gt $MAXLENGTH ]; then echo "MAXLENGTH EXCEEDED." @@ -30,20 +18,20 @@ fi source ../include/nixdorf init -makeNewline $TOP -makeLeft +makeNewline $TOP $FILE +makeLeft $LEFT $FILE printf "$GIVENNAME" >> $FILE -makeNewline 4 -makeLeft +makeNewline 4 $FILE +makeLeft $LEFT $FILE printf "$SURNAME" >> $FILE -makeNewline 3 -makeLeft +makeNewline 3 $FILE +makeLeft $LEFT $FILE printf "$HOME" >> $FILE -makeNewline 4 -makeLeft +makeNewline 4 $FILE +makeLeft $LEFT $FILE if [ -n "$EVENT" ]; then printf "$EVENT, $(date -I)" >> $FILE diff --git a/jhp/gpgkey b/jhp/gpgkey index 31f8a5b..52c2967 100755 --- a/jhp/gpgkey +++ b/jhp/gpgkey @@ -45,18 +45,6 @@ function moveDown() { done } -function makeNewline() { - for((i=0; i<$1; i++)); do - printf "\n" >> $FILE - done -} - -function makeLeft() { - for((i=0; i<$1; i++)); do - printf " " >> $FILE - done -} - function heading() { moveDown @@ -69,11 +57,11 @@ function heading() { fi if [ $PAGE -eq 1 ]; then - makeLeft $HEADINGNEXTPAGE + makeLeft $HEADINGNEXTPAGE $FILE fi - makeLeft $LEFT - makeLeft $SPACE + makeLeft $LEFT $FILE + makeLeft $SPACE $FILE bigLetters $FILE printf "GPG" >> $FILE @@ -90,10 +78,10 @@ function insertFP() { smallLetters $FILE if [ $PAGE -eq 1 ]; then - makeLeft $NEXTPAGE + makeLeft $NEXTPAGE $FILE fi - makeLeft $LEFT - makeLeft $(($SPACE + 2)) + makeLeft $LEFT $FILE + makeLeft $(($SPACE + 2)) $FILE printf "$1 $2 $3 $4" >> $FILE resetLetters $FILE printf "\n" >> $FILE @@ -101,10 +89,10 @@ function insertFP() { smallLetters $FILE if [ $PAGE -eq 1 ]; then - makeLeft $NEXTPAGE + makeLeft $NEXTPAGE $FILE fi - makeLeft $LEFT - makeLeft $(($SPACE + 2)) + makeLeft $LEFT $FILE + makeLeft $(($SPACE + 2)) $FILE printf "$1 $2 $3 $4" >> $FILE resetLetters $FILE printf "\n" >> $FILE @@ -114,8 +102,8 @@ function insertFP() { if [ $PAGE -eq 1 ]; then makeLeft $NEXTPAGE fi - makeLeft $LEFT - makeLeft $(($SPACE + 2)) + makeLeft $LEFT $FILE + makeLeft $(($SPACE + 2)) $FILE printf "$1 $2" >> $FILE resetLetters $FILE printf "\n" >> $FILE @@ -123,10 +111,10 @@ function insertFP() { smallLetters $FILE if [ $PAGE -eq 1 ]; then - makeLeft $NEXTPAGE + makeLeft $NEXTPAGE $FILE fi - makeLeft $LEFT - makeLeft $(($SPACE + 2)) + makeLeft $LEFT $FILE + makeLeft $(($SPACE + 2)) $FILE if [ -n "$EVENT" ]; then printf "$EVENT, $(date -I)" >> $FILE @@ -138,7 +126,7 @@ function insertFP() { source ../include/nixdorf init -makeNewline $TOP +makeNewline $TOP $FILE heading insertFP $@ diff --git a/jhp/iro b/jhp/iro index c961215..c307e5d 100755 --- a/jhp/iro +++ b/jhp/iro @@ -47,18 +47,6 @@ function moveDown() { done } -function makeNewline() { - for((i=0; i<$1; i++)); do - printf "\n" >> $FILE - done -} - -function makeLeft() { - for((i=0; i<$1; i++)); do - printf " " >> $FILE - done -} - function heading() { moveDown @@ -76,29 +64,29 @@ function heading() { if [ $PAGE -eq 1 ]; then makeLeft $NEXTPAGE fi - makeLeft 1 - makeLeft $SPACE + makeLeft 1 $FILE + makeLeft $SPACE $FILE italicLetters $FILE printf "INTERGALACTIC\n" >> $FILE if [ $PAGE -eq 1 ]; then makeLeft $NEXTPAGE fi - makeLeft 1 - makeLeft $SPACE + makeLeft 1 $FILE + makeLeft $SPACE $FILE printf "REGISTRATION\n" >> $FILE bigLetters $FILE if [ $PAGE -eq 1 ]; then - makeLeft $HEADINGNEXTPAGE + makeLeft $HEADINGNEXTPAGE $FILE if [ $(($FIELD % 2)) -eq 1 ]; then - makeLeft $(($HSPACE - 1)) + makeLeft $(($HSPACE - 1)) $FILE fi else if [ $(($FIELD % 2)) -eq 0 ]; then - makeLeft 1 + makeLeft 1 $FILE fi - makeLeft $HSPACE + makeLeft $HSPACE $FILE fi printf "OFFICE\n" >> $FILE resetLetters $FILE @@ -114,10 +102,10 @@ function insertDate() { smallLetters $FILE if [ $PAGE -eq 1 ]; then - makeLeft $NEXTPAGESMALL + makeLeft $NEXTPAGESMALL $FILE fi - makeLeft $LEFT - makeLeft $(($SPACE + 2)) + makeLeft $LEFT $FILE + makeLeft $(($SPACE + 2)) $FILE if [ -n "$EVENT" ]; then printf "$EVENT, $(date -I)" >> $FILE else @@ -129,7 +117,7 @@ function insertDate() { source ../include/nixdorf init -makeNewline $TOP +makeNewline $TOP $FILE heading insertDate diff --git a/start b/start index b137d55..02e1a7d 100755 --- a/start +++ b/start @@ -169,7 +169,7 @@ function jhpReg() { confirm=" Forename: $FNAME\n Surename: $SNAME\n Planet: $PLANET" - ynBox "IRO Stamp" "Does this being wants to have a IRO stamp?" + ynBox "IRO Stamp" "Does this being want to have a IRO stamp?" if [ $? -eq 0 ]; then STAMP=true else