pandora-scripts: try to fix currentuser/home mess

[openpandora.oe.git] / recipes / pandora-system / pandora-scripts / op_createsd.sh

diff --git a/recipes/pandora-system/pandora-scripts/op_createsd.sh b/recipes/pandora-system/pandora-scripts/op_createsd.sh
index 54796cd..2381e8a 100644 (file)
--- a/recipes/pandora-system/pandora-scripts/op_createsd.sh
+++ b/recipes/pandora-system/pandora-scripts/op_createsd.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+
+. /usr/pandora/scripts/op_common.sh
+user=$(get_user)
+
 if selection=$(grep "/dev/mmcblk" /proc/mounts | cut -f 2 -d " " | sed 's/\\040/ /g' | zenity --title="Create Pandora SD Card" --width="380" --height="250" --list --text="This utility creates the needed Pandora directories on your SD Card.\nYou can also use it to format your SD Card.\n\nPlease select the SD Card to be used (no data will be changed yet):" --column="Select card"); then
 selection2=$(echo "$selection" | sed 's/ /\\\\040/g')
 device=$(grep "${selection2}" /proc/mounts | awk '{print $1}')
@@ -37,7 +41,6 @@ device=$(grep "${selection2}" /proc/mounts | awk '{print $1}')
                                sync
                                gksudo mkdir /tmp/mnt
                                if gksudo mount $device /tmp/mnt; then
-                                               user=$(cat /tmp/currentuser)
                                                gksudo mkdir /tmp/mnt/pandora
                                                gksudo mkdir /tmp/mnt/pandora/menu
                                                gksudo mkdir /tmp/mnt/pandora/apps