Merge branch 'new_year'

Conflicts:
	src/pizza
This commit is contained in:
Oliver Rümpelein 2015-01-02 21:45:00 +01:00
commit 55c32ccb80
2 changed files with 73 additions and 44 deletions

25
assets/new_year Normal file
View file

@ -0,0 +1,25 @@
.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:.
* ) *
) * (
) ( (
( ) ( )
) * ) ) (
( ( ( *
) H ) )
[ ] (
( * |-| * ) (
* ) |_| . )
( | | .
) / \ . ' . *
( |_____| ' . .
) | ___ | \~~~/ ' . (
* | \ / | \_/ \~~~/ )
| _Y_ | | \_/ (
* |-----| __|__ | *
`-----` __|__
__, ,__) __, ,__) __, ,__)
(--|__| _ ,_ ,_ (--|\ | _ (--\ | _ _ ,_
_| |(_||_)|_)(_| _| \|(/_(_|_) \|(/_(_||
( | | ,_| ( (__|
.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:.

View file

@ -14,6 +14,7 @@ help() {
echo " -l Send a heart"
echo " -b Send happy birthday"
echo " -c Send merry christmas"
echo " -n Send a happy new year"
echo " -m <addr> Receivers address (non-optional)"
echo " -s <addr> Senders address, defaults to user@host"
echo " -h Print this help-message"
@ -25,7 +26,7 @@ if [ ! $1 ]; then
exit 1
fi
while getopts "plbchm:s:" opt; do
while getopts "plbcnhm:s:" opt; do
case ${opt} in
p )
: ${PIZZAART:="pizza"}
@ -39,6 +40,9 @@ while getopts "plbchm:s:" opt; do
c )
: ${PIZZAART:="christmastree"}
;;
n )
: ${PIZZAART:="new_year"}
;;
m )
PIZZARCV="${OPTARG}"
;;