mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-20 17:58:07 +02:00
Make a separate 'indent' function for 'append_file'
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5333 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
8cefd52c95
commit
1bc2bed68e
@ -96,20 +96,28 @@ progress_message_and_save()
|
|||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
# If a filename is passed, then echo the contents of that file indented by $INDENT and perform INCLUDE processing.
|
# Echo the contents of the passed file indented by $INDENT
|
||||||
# If no filename is passed, then echo the contents of STDIN intended by $INDENT but do not perform INCLUDE processing.
|
|
||||||
#
|
#
|
||||||
indent() {
|
indent() {
|
||||||
if [ -n "$INDENT" ]; then
|
if [ -n "$INDENT" ]; then
|
||||||
if [ $# -ge 1 ]; then
|
if [ -n "$HAVEAWK" ]; then
|
||||||
read_file $1 0 | eval sed \'s\/^/"$INDENT"\/\' -
|
eval awk \''BEGIN { indent=1; }; /^\s*$/ { print ""; indent=1; next; }; { if (indent == 1) print "'"$INDENT"'" $0; else print; }; { indent=1; }; /\\$/ { indent=0; };'\' $1
|
||||||
else
|
else
|
||||||
eval sed \'s\/^/"$INDENT"\/\'
|
eval sed \'s\/^/"$INDENT"\/\' $1
|
||||||
fi
|
fi
|
||||||
elif [ $# -ge 1 ]; then
|
|
||||||
read_file $1 0
|
|
||||||
else
|
else
|
||||||
cat
|
cat $1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
#
|
||||||
|
# Echo the contents of the passed file indented by $INDENT and perform INCLUDE processing.
|
||||||
|
#
|
||||||
|
indent1() {
|
||||||
|
if [ -n "$INDENT" ]; then
|
||||||
|
read_file $1 0 | eval sed \'s\/^/"$INDENT"\/\' -
|
||||||
|
else
|
||||||
|
read_file $1 0
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -129,7 +137,7 @@ append_file() # $1 = File Name
|
|||||||
*)
|
*)
|
||||||
if [ -f $user_exit ]; then
|
if [ -f $user_exit ]; then
|
||||||
save_progress_message "Processing $user_exit ..."
|
save_progress_message "Processing $user_exit ..."
|
||||||
indent $user_exit >&3
|
indent1 $user_exit >&3
|
||||||
save_command
|
save_command
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user