diff --git a/web-splash/ipkg/rules b/web-splash/ipkg/rules index 071ac82..1bfaac2 100755 --- a/web-splash/ipkg/rules +++ b/web-splash/ipkg/rules @@ -24,7 +24,7 @@ install: @# install binaries @mkdir -p $(DESTDIR)/usr/lib - @cp splash-functions.inc $(DESTDIR)/usr/lib + @cp web-splash-functions.inc $(DESTDIR)/usr/lib @mkdir -p $(DESTDIR)/usr/bin @cp web-splash.sh $(DESTDIR)/usr/bin diff --git a/web-splash/splash-functions.inc b/web-splash/web-splash-functions.inc similarity index 100% rename from web-splash/splash-functions.inc rename to web-splash/web-splash-functions.inc diff --git a/web-splash/web-splash.sh b/web-splash/web-splash.sh index 4120e10..3de66ee 100755 --- a/web-splash/web-splash.sh +++ b/web-splash/web-splash.sh @@ -9,7 +9,7 @@ set -ue . /etc/web-splash.conf -. "$SPLASH_LIB/splash-functions.inc" +. "$SPLASH_LIB/web-splash-functions.inc" # check for DEBUG mode @@ -38,10 +38,10 @@ case "$ACTION" in traffic ) if [ $# -eq 1 ] then get_IP_list | while read IP - do echo "$IP `get_IP_traffic $IP`" + do echo "$IP `get_IP_traffic \"$IP\"`" done else IP="$2" - echo "$IP `get_IP_traffic $IP`" + get_IP_traffic "$IP" fi ;; * )