get rid of library version numbers in luci olsrd code

Signed-off-by: Philipp Borgers <borgers@mi.fu-berlin.de>

4 files changed, 8 insertions, 8 deletions

diff --git a/contrib/package/freifunk-common/files/usr/bin/neigh.sh b/contrib/package/freifunk-common/files/usr/bin/neigh.sh
index 468ed7a3e..82589ecfd 100755
--- a/contrib/package/freifunk-common/files/usr/bin/neigh.sh
+++ b/contrib/package/freifunk-common/files/usr/bin/neigh.sh
@@ -10,7 +10,7 @@ hostsfile_getname()
 
 	while value="$( uci -q get $config.@LoadPlugin[$i].library )"; do {
 		case "$value" in
-			'olsrd_nameservice.so.'*)
+			'olsrd_nameservice'*)
 				file="$( uci -q get $config.@LoadPlugin[$i].hosts_file )"
 				break
 			;;
diff --git a/contrib/package/freifunk-common/files/usr/sbin/ff_olsr_watchdog b/contrib/package/freifunk-common/files/usr/sbin/ff_olsr_watchdog
index 8ac803d30..af1d7ca68 100755
--- a/contrib/package/freifunk-common/files/usr/sbin/ff_olsr_watchdog
+++ b/contrib/package/freifunk-common/files/usr/sbin/ff_olsr_watchdog
@@ -11,7 +11,7 @@ if fs.access("/var/run/olsrd.pid") or fs.access("/var/run/olsrd4.pid") then
 
 	x:foreach("olsrd", "LoadPlugin",
 		function(s)
-			if s.library == "olsrd_watchdog.so.0.1" then
+			if s.library == "olsrd_watchdog" then
 				intv  = tonumber(s.interval)
 				stamp = s.file
 			end
diff --git a/contrib/package/freifunk-mapupdate/files/usr/sbin/ff_mapupdate.sh b/contrib/package/freifunk-mapupdate/files/usr/sbin/ff_mapupdate.sh
index 40a077f15..b06e145d6 100755
--- a/contrib/package/freifunk-mapupdate/files/usr/sbin/ff_mapupdate.sh
+++ b/contrib/package/freifunk-mapupdate/files/usr/sbin/ff_mapupdate.sh
@@ -8,7 +8,7 @@ MAPSERVER="$(uci -q get freifunk-mapupdate.mapupdate.mapserver)"
 [ -z "$MAPSERVER" ] && logger -t "freifunk-mapupdate:" "No mapserver configured" && exit 1
 
 #check if nameservice plugin is installed and enabled, else exit
-nslib=`uci show olsrd |grep olsrd_nameservice.so |awk {' FS="."; print $1"."$2 '}`
+nslib=`uci show olsrd |grep olsrd_nameservice |awk {' FS="."; print $1"."$2 '}`
 if [ -n "$nslib" ]; then
 		LATLONFILE="$(uci -q get $nslib.latlon_file)"
 		if [ -z "$LATLONFILE" ]; then
diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh
index 9ebcb46b1..a435e4b1b 100755
--- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh
+++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh
@@ -73,7 +73,7 @@ setup_nameservice() {
 
 	uci batch <<- EOF
 		set $cfg.olsrd_nameservice=LoadPlugin
-		set $cfg.olsrd_nameservice.library="olsrd_nameservice.so.0.4"
+		set $cfg.olsrd_nameservice.library="olsrd_nameservice"
 		set $cfg.olsrd_nameservice.latlon_file="$llfile"
 		set $cfg.olsrd_nameservice.hosts_file="$hosts"
 		set $cfg.olsrd_nameservice.sighup_pid_file="/var/run/dnsmasq.pid"
@@ -91,7 +91,7 @@ setup_dyngw_plain() {
     if [ "$general_sharenet" == 1 ]; then
 	uci set $cfg.dyngw_plain=LoadPlugin
 	uci set $cfg.dyngw_plain.ignore=0
-	uci set $cfg.dyngw_plain.library="olsrd_dyn_gw_plain.so.0.4"
+	uci set $cfg.dyngw_plain.library="olsrd_dyn_gw_plain"
 	uci_commitverbose "Setup olsrd_dyngw_plain plugin" $cfg
     fi
 
@@ -106,7 +106,7 @@ setup_watchdog() {
 
 	uci batch <<- EOF
 		set $cfg.olsrd_watchdog=LoadPlugin
-		set $cfg.olsrd_watchdog.library="olsrd_watchdog.so.0.1"
+		set $cfg.olsrd_watchdog.library="olsrd_watchdog"
 		set $cfg.olsrd_watchdog.file="$watchdogfile"
 		set $cfg.olsrd_watchdog.interval=30
 	EOF
@@ -118,7 +118,7 @@ setup_jsoninfo() {
 	proto="$1"
 	uci batch <<- EOF
 		set $cfg.olsrd_jsoninfo=LoadPlugin
-		set $cfg.olsrd_jsoninfo.library="olsrd_jsoninfo.so.1.1"
+		set $cfg.olsrd_jsoninfo.library="olsrd_jsoninfo"
 	EOF
 	if [ "$proto" = "6" ]; then
 		uci set $cfg.olsrd_jsoninfo.ipv6only='1'
@@ -130,7 +130,7 @@ setup_txtinfo() {
 	proto="$1"
 	uci batch <<- EOF
 	    set $cfg.olsrd_txtinfo=LoadPlugin
-	    set $cfg.olsrd_txtinfo.library="olsrd_txtinfo.so.1.1"
+	    set $cfg.olsrd_txtinfo.library="olsrd_txtinfo"
 	EOF
 	if [ "$proto" = "6" ]; then
 		uci set $cfg.olsrd_txtinfo.ipv6only='1'