--- ../2003-02-27-04/moz Thu Feb 27 07:25:50 2003 +++ moz Thu Feb 27 07:23:00 2003 @@ -659,41 +659,50 @@ while [ -n "$1" ]; do #else mozilla "$1" & #fi - ping=1 - mozilla -remote "ping()" 2> /dev/null error=$? - test $verbose -eq 1 && echo -n $error" " >&2 - while [ $error -ne 0 ] && [ $ping -le 50 ]; do - let ping++ + if [ -n "$2" ]; then + ping=1 mozilla -remote "ping()" 2> /dev/null error=$? test $verbose -eq 1 && echo -n $error" " >&2 - if [ $ping -eq 25 ]; then - echo " - " - L "Mozilla was pinged $ping times without response, trying + while [ $error -ne 0 ] && [ $ping -le 50 ]; do + let ping++ + mozilla -remote "ping()" 2> /dev/null + error=$? + test $verbose -eq 1 && echo -n $error" " >&2 + if [ $ping -eq 25 ]; then + echo " + " + L "Mozilla was pinged $ping times without response, trying $ping more times before giving up. Press Ctrl+C to quit." \ - "Mozilla wurde $ping Mal erfolglos gepingt, es werden weitere + "Mozilla wurde $ping Mal erfolglos gepingt, es werden weitere $ping Versuche unternommen. Drücken Sie Strg+C, um abzubrechen." | $fmt >&2 - echo -n " + echo -n " ... " >&2 - fi - done - if [ $error -eq 0 ]; then - msg_done - test $verbose -eq 1 && \ - L "Mozilla was pinged "$ping" times until startup was complete." \ - "Mozilla wurde "$ping" Mal gepingt, bevor er vollständig gestartet \ + fi + done + if [ $error -eq 0 ]; then + msg_done + test $verbose -eq 1 && \ + L "Mozilla was pinged "$ping" times until startup was complete." \ + "Mozilla wurde "$ping" Mal gepingt, bevor er vollständig gestartet \ war." | $fmt >&2 - else - msg_failed - test $verbose -eq 1 && \ - L " + else + msg_failed + test $verbose -eq 1 && \ + L " Mozilla was pinged "$ping" times without response. Please check your Mozilla installation." \ - " + " Mozilla wurde "$ping" Mal erfolglos gepingt. Bitte überprüfen Sie ihre Mozilla-Installation." | $fmt >&2 + fi + else + if [ $error -eq 0 ]; then + msg_done + else + msg_failed + fi fi else # check what kind of URI was given