Index: ipk/source.sh4/swapemus_oscam_6089/CONTROL/prerm
===================================================================
--- ipk/source.sh4/swapemus_oscam_6089/CONTROL/prerm	(revision 23015)
+++ 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