Index: ipk/source.sh4/swapemus_oscam_6089/CONTROL/postinst
===================================================================
--- ipk/source.sh4/swapemus_oscam_6089/CONTROL/postinst	(revision 23284)
+++ ipk/source.sh4/swapemus_oscam_6089/CONTROL/postinst	(revision 23298)
@@ -1,13 +1,10 @@
 #!/bin/sh
 TMP=/tmp/.oscam
-PLUGINDIR=/var/swap/bin
-CONFIGDIR=/var/etc
-PLUGINDIR=/var/swap/keys
+INSTDIR="$1"
 
-
-if [ ! -e /var/swap/keys/oscam.conf ]; then
+if [ ! -e "$INSTDIR/keys/oscam.conf" ]; then
 	echo "use ipk config file: oscam.conf"
-	echo "rename /var/swap/keys/oscam.conf.oscam > /var/swap/keys/oscam.conf"
-	mv /var/swap/keys/oscam.conf.oscam /var/swap/keys/oscam.conf
+	echo "rename $INSTDIR/keys/oscam.conf.oscam > $INSTDIR/keys/oscam.conf"
+	mv "$INSTDIR/keys/oscam.conf.oscam" "$INSTDIR/keys/oscam.conf"
 else
 	echo "found user config file: oscam.conf"
@@ -15,8 +12,8 @@
 fi
 
-if [ ! -e /var/swap/keys/oscam.provid ]; then
+if [ ! -e "$INSTDIR/keys/oscam.provid" ]; then
 	echo "use ipk config file: oscam.provid"
-	echo "rename /var/swap/keys/oscam.provid.oscam > /var/swap/keys/oscam.provid"
-	mv /var/swap/keys/oscam.provid.oscam /var/swap/keys/oscam.provid
+	echo "rename $INSTDIR/keys/oscam.provid.oscam > $INSTDIR/keys/oscam.provid"
+	mv "$INSTDIR/keys/oscam.provid.oscam" "$INSTDIR/keys/oscam.provid"
 else
 	echo "found user config file: oscam.provid"
@@ -24,8 +21,8 @@
 fi
 
-if [ ! -e /var/swap/keys/oscam.srvid ]; then
+if [ ! -e "$INSTDIR/keys/oscam.srvid" ]; then
 	echo "use ipk config file: oscam.srvid"
-	echo "rename /var/swap/keys/oscam.srvid.oscam > /var/swap/keys/oscam.srvid"
-	mv /var/swap/keys/oscam.srvid.oscam /var/swap/keys/oscam.srvid
+	echo "rename $INSTDIR/keys/oscam.srvid.oscam > $INSTDIR/keys/oscam.srvid"
+	mv "$INSTDIR/keys/oscam.srvid.oscam" "$INSTDIR/keys/oscam.srvid"
 else
 	echo "found user config file: oscam.srvid"
@@ -33,8 +30,8 @@
 fi
 
-if [ ! -e /var/swap/keys/oscam.server ]; then
+if [ ! -e "$INSTDIR/keys/oscam.server" ]; then
 	echo "use ipk config file: oscam.server"
-	echo "rename /var/swap/keys/oscam.server.oscam > /var/swap/keys/oscam.server"
-	mv /var/swap/keys/oscam.server.oscam /var/swap/keys/oscam.server
+	echo "rename $INSTDIR/keys/oscam.server.oscam > $INSTDIR/keys/oscam.server"
+	mv "$INSTDIR/keys/oscam.server.oscam" "$INSTDIR/keys/oscam.server"
 else
 	echo "found user config file: oscam.server"
@@ -42,8 +39,8 @@
 fi
 
-if [ ! -e /var/swap/keys/oscam.user ]; then
+if [ ! -e "$INSTDIR/keys/oscam.user" ]; then
 	echo "use ipk config file: oscam.user"
-	echo "rename /var/swap/keys/oscam.user.oscam > /var/swap/keys/oscam.user"
-	mv /var/swap/keys/oscam.user.oscam /var/swap/keys/oscam.user
+	echo "rename $INSTDIR/keys/oscam.user.oscam > $INSTDIR/keys/oscam.user"
+	mv "$INSTDIR/keys/oscam.user.oscam" "$INSTDIR/keys/oscam.user"
 else
 	echo "found user config file: oscam.user"
@@ -51,8 +48,8 @@
 fi
 
-if [ ! -e /var/swap/keys/oscam.services ]; then
+if [ ! -e "$INSTDIR/keys/oscam.services" ]; then
 	echo "use ipk config file: oscam.services"
-	echo "rename /var/swap/keys/oscam.services.oscam > /var/swap/keys/oscam.services"
-	mv /var/swap/keys/oscam.services.oscam /var/swap/keys/oscam.services
+	echo "rename $INSTDIR/keys/oscam.services.oscam > $INSTDIR/keys/oscam.services"
+	mv "$INSTDIR/keys/oscam.services.oscam" "$INSTDIR/keys/oscam.services"
 else
 	echo "found user config file: oscam.services"
@@ -60,8 +57,8 @@
 fi
 
-if [ ! -e /var/swap/keys/oscam.dvbapi ]; then
+if [ ! -e "$INSTDIR/keys/oscam.dvbapi" ]; then
 	echo "use ipk config file: oscam.dvbapi"
-	echo "rename /var/swap/keys/oscam.dvbapi.oscam > /var/swap/keys/oscam.dvbapi"
-	mv /var/swap/keys/oscam.dvbapi.oscam /var/swap/keys/oscam.dvbapi
+	echo "rename $INSTDIR/keys/oscam.dvbapi.oscam > $INSTDIR/keys/oscam.dvbapi"
+	mv "$INSTDIR/keys/oscam.dvbapi.oscam" "$INSTDIR/keys/oscam.dvbapi"
 else
 	echo "found user config file: oscam.dvbapi"
@@ -69,8 +66,8 @@
 fi
 
-if [ ! -e /var/swap/keys/oscam.stat ]; then
+if [ ! -e "$INSTDIR/keys/oscam.stat" ]; then
 	echo "use ipk config file: oscam.stat"
-	echo "rename /var/swap/keys/oscam.stat.oscam > /var/swap/keys/oscam.stat"
-	mv /var/swap/keys/oscam.stat.oscam /var/swap/keys/oscam.stat
+	echo "rename $INSTDIR/keys/oscam.stat.oscam > $INSTDIR/keys/oscam.stat"
+	mv "$INSTDIR/keys/oscam.stat.oscam" "$INSTDIR/keys/oscam.stat"
 else
 	echo "found user config file: oscam.stat"
@@ -79,12 +76,11 @@
 
 echo "successfully installed"
-link=`readlink /var/swap`
-if [ `df | grep /dev/mtdblock | grep mnt | sed 's/ \+/ /g' | cut -d ' ' -f4 | head -n1 | wc -l` -eq 1 ] && [ $link = "/mnt/swapextensions" ]; then
-	SPACE=`df | grep /dev/mtdblock | grep mnt | sed 's/ \+/ /g' | cut -d ' ' -f4 | head -n1`
+if [ "/var/swap" == "$INSTDIR" ]; then
+	echo "syncing disk"
+	sync
+else
+	SPACE=`getfreespace "$INSTDIR"`
 	FREE=`expr $SPACE - 100`
 	echo new freespace size $FREE kb
-else
-	echo "syncing disk"
-	sync
 fi
 exit 0
Index: ipk/source.sh4/swapemus_oscam_6089/CONTROL/postrm
===================================================================
--- ipk/source.sh4/swapemus_oscam_6089/CONTROL/postrm	(revision 23284)
+++ ipk/source.sh4/swapemus_oscam_6089/CONTROL/postrm	(revision 23298)
@@ -1,16 +1,16 @@
 #!/bin/sh
 TMP=/tmp/.oscam
+INSTDIR="$1"
 
-rm -r /var/swap/bin/oscam_6089_swap
+rm -r "$INSTDIR/bin/oscam_6089_swap"
 
 echo "successfully removed"
-link=`readlink /var/swap`
-if [ `df | grep /dev/mtdblock | grep mnt | sed 's/ \+/ /g' | cut -d ' ' -f4 | head -n1 | wc -l` -eq 1 ] && [ $link = "/mnt/swapextensions" ]; then
-	SPACE=`df | grep /dev/mtdblock | grep mnt | sed 's/ \+/ /g' | cut -d ' ' -f4 | head -n1`
+if [ "/var/swap" == "$INSTDIR" ]; then
+	echo "syncing disk"
+	sync
+else
+	SPACE=`getfreespace "$INSTDIR"`
 	FREE=`expr $SPACE - 100`
 	echo new freespace size $FREE kb
-else
-	echo "syncing disk"
-	sync
 fi
 exit 0
Index: ipk/source.sh4/swapemus_oscam_6089/CONTROL/preinst
===================================================================
--- ipk/source.sh4/swapemus_oscam_6089/CONTROL/preinst	(revision 23284)
+++ ipk/source.sh4/swapemus_oscam_6089/CONTROL/preinst	(revision 23298)
@@ -2,4 +2,5 @@
 #
 TMP=/tmp/.oscam
+INSTDIR="$1"
 
 model=`cat /etc/model`
@@ -16,16 +17,18 @@
 fi
 
-echo "checking swapstick"
-if [ ! -d /var/swap/bin/ ]; then
+echo "checking install path"
+if [ ! -d "$INSTDIR/bin/" ]; then
   echo "--------------------------"
-	echo "no swapstick found...."
+	echo "no install path found...."
 	echo "--------------------------"
 	exit 1
 fi
-echo "swapstick found...."
+echo "install path found...."
 
-link=`readlink /var/swap`
-if [ `df | grep /dev/mtdblock | grep mnt | sed 's/ \+/ /g' | cut -d ' ' -f4 | head -n1 | wc -l` -eq 1 ] && [ $link = "/mnt/swapextensions" ]; then
-	SPACE=`df | grep /dev/mtdblock | grep mnt | sed 's/ \+/ /g' | cut -d ' ' -f4 | head -n1`
+if [ "/var/swap" == "$INSTDIR" ]; then
+	echo "syncing disk"
+	sync
+else	
+	SPACE=`getfreespace "$INSTDIR"`
 	FREE=`expr $SPACE - 100`
 	SIZE=936
@@ -39,7 +42,4 @@
 		echo ok		
 	fi
-else
-	echo "syncing disk"
-	sync
 fi
 
@@ -48,5 +48,5 @@
 if  [ `cat /etc/motd | grep $buildgroup | grep M | grep rev | wc -l` -eq 0 ]; then 	 	 
 	echo --------------------------- 	 	 
-	echo DONT USE this IPK Package!! 	 	 
+	echo DONT USE this TPK Package!! 	 	 
 	echo --- 	 	 
 	echo Only for $buildgroup Image!! 	 	 
@@ -54,5 +54,5 @@
 	exit 1 	 	 
 fi
-echo "installing Oscam Build 6089 to swapstick..."
+echo "installing Oscam Build 6089..."
 
 exit 0
Index: ipk/source.sh4/swapemus_oscam_6089/CONTROL/prerm
===================================================================
--- ipk/source.sh4/swapemus_oscam_6089/CONTROL/prerm	(revision 23284)
+++ ipk/source.sh4/swapemus_oscam_6089/CONTROL/prerm	(revision 23298)
@@ -1,54 +1,54 @@
 #!/bin/sh
 TMP=/tmp/.oscam
+INSTDIR="$1"
 
-if [ ! -e /var/swap/keys/oscam.conf.oscam ]; then
+if [ ! -e "$INSTDIR/keys/oscam.conf.oscam" ]; then
 	echo "remove ipk oscam.conf"
-	rm /var/swap/keys/oscam.conf
+	rm "$INSTDIR/keys/oscam.conf"
 fi
 
-if [ ! -e /var/swap/keys/oscam.provid.oscam ]; then
+if [ ! -e "$INSTDIR/keys/oscam.provid.oscam" ]; then
 	echo "remove ipk oscam.provid"
-	rm /var/swap/keys/oscam.provid
+	rm "$INSTDIR/keys/oscam.provid"
 fi
 
-if [ ! -e /var/swap/keys/oscam.srvid.oscam ]; then
+if [ ! -e "$INSTDIR/keys/oscam.srvid.oscam" ]; then
 	echo "remove ipk oscam.srvid"
-	rm /var/swap/keys/oscam.srvid
+	rm "$INSTDIR/keys/oscam.srvid"
 fi
 
-if [ ! -e /var/swap/keys/oscam.server.oscam ]; then
+if [ ! -e "$INSTDIR/keys/oscam.server.oscam" ]; then
 	echo "remove ipk oscam.server"
-	rm /var/swap/keys/oscam.server
+	rm "$INSTDIR/keys/oscam.server"
 fi
 
-if [ ! -e /var/swap/keys/oscam.user.oscam ]; then
+if [ ! -e "$INSTDIR/keys/oscam.user.oscam" ]; then
 	echo "remove ipk oscam.user"
-	rm /var/swap/keys/oscam.user
+	rm "$INSTDIR/keys/oscam.user"
 fi
 
-if [ ! -e /var/swap/keys/oscam.services.oscam ]; then
+if [ ! -e "$INSTDIR/keys/oscam.services.oscam" ]; then
 	echo "remove ipk oscam.services"
-	rm /var/swap/keys/oscam.services
+	rm "$INSTDIR/keys/oscam.services"
 fi
 
-if [ ! -e /var/swap/keys/oscam.dvbapi.oscam ]; then
+if [ ! -e "$INSTDIR/keys/oscam.dvbapi.oscam" ]; then
 	echo "remove ipk oscam.dvbapi"
-	rm /var/swap/keys/oscam.dvbapi
+	rm "$INSTDIR/keys/oscam.dvbapi"
 fi
 
-if [ ! -e /var/swap/keys/oscam.stat.oscam ]; then
+if [ ! -e "$INSTDIR/keys/oscam.stat.oscam" ]; then
 	echo "remove ipk oscam.stat"
-	rm /var/swap/keys/oscam.stat
+	rm "$INSTDIR/keys/oscam.stat"
 fi
 
-link=`readlink /var/swap`
-if [ `df | grep /dev/mtdblock | grep mnt | sed 's/ \+/ /g' | cut -d ' ' -f4 | head -n1 | wc -l` -eq 1 ] && [ $link = "/mnt/swapextensions" ]; then
-	SPACE=`df | grep /dev/mtdblock | grep mnt | sed 's/ \+/ /g' | cut -d ' ' -f4 | head -n1`
+if [ "/var/swap" == "$INSTDIR" ]; then
+	echo "syncing disk"
+	sync
+else
+	SPACE=`getfreespace "$INSTDIR"`
 	FREE=`expr $SPACE - 100`
 	echo new freespace size $FREE kb
-else
-	echo "syncing disk"
-	sync
 fi
-echo "Removing Oscam Build 6089 from Swapstick"
+echo "Removing Oscam Build 6089"
 exit 0