diff --git a/mannaggia.sh b/mannaggia.sh index d86d04e..10daf93 100755 --- a/mannaggia.sh +++ b/mannaggia.sh @@ -30,15 +30,14 @@ ndsflag=false wallflag=false shutdown=false off=false -DELSTRING1="" -DELSTRING2="" +DELSTRING1=" |||" DEFPLAYER="mplayer -cache 1024 -" PLAYER="${PLAYER:-$DEFPLAYER}" LC_CTYPE=C say() { local IFS=+ - mplayer -ao alsa -really-quiet -noconsolecontrols "http://translate.google.com/translate_tts?ie=UTF-8&client=tw-ob&q=$*&tl=it" + mplayer -really-quiet -noconsolecontrols "http://translate.google.com/translate_tts?ie=UTF-8&client=tw-ob&q=$*&tl=it" } if [ $(uname) = "Darwin" ] @@ -126,7 +125,8 @@ fi while [ "$nds" != 0 ] do # shellcheck disable=SC2019 - MANNAGGIA="Mannaggia $(curl -s "www.santiebeati.it/$(' -f 4-9| sed '/^.$/d' | $shufCmd -n1 |awk -F "$DELSTRING1" '{print$1$2}'|awk -F "$DELSTRING2" '{print$1}' | iconv -f ISO-8859-1)" + MANNAGGIA="Mannaggia $(curl -s "https://www.santiebeati.it/$(' -f 3-9| sed '/^.$/d' | grep -vsI '' | $shufCmd -n1 |awk -F "$DELSTRING1" '{print$1$2" "$3$4}' | iconv -f ISO-8859-1)" + if [ "$wallflag" = true ] then pot=$(( nds % 50 ))