Fremantle updates: easy-chroot 0.2.7, easy-deb-chroot 0.9.42

[easy-deb-chroot] / fremantle / easy-deb-chroot / control / postinst

diff --git a/fremantle/easy-deb-chroot/control/postinst b/fremantle/easy-deb-chroot/control/postinst
index d61c396..a7cc187 100644 (file)
--- a/fremantle/easy-deb-chroot/control/postinst
+++ b/fremantle/easy-deb-chroot/control/postinst
@@ -1,11 +1,14 @@
 #!/bin/sh
 
-set -e
+closechroot
 
-CHROOT=/debian
+# set -e
+
+CHROOT=/.debian
 TSTFILE=/usr/bin/hilda
+
 if [ ! -d "$CHROOT" ] ; then
-    mkdir /debian
+    mkdir /.debian
 # else
 #    if [ -f "$CHROOT$TSTFILE" ] || [ ! "x`/sbin/debian echo hello | grep hello`" = "x" ] ; then
 #       closechroot
@@ -26,9 +29,10 @@ fi
 #   export UPGRD="upgrade"
 # fi
 
-#if  [ -f "/home/user/.xbindkeysrc.scm.orig" ] ; then
-#  mv /home/user/.xbindkeysrc.scm.orig /home/user/.xbindkeysrc.scm
-#fi
+if  [ -f "/home/user/.xbindkeysrc.orig" ] ; then
+  rm /home/user/.xbindkeysrc.orig
+#  mv /home/user/.xbindkeysrc.orig /home/user/.xbindkeysrc
+fi
 
 if  [ -f "/home/user/.gimp-2.6/gimprc.orig" ] ; then
   mv /home/user/.gimp-2.6/gimprc.orig /home/user/.gimp-2.6/gimprc
@@ -38,17 +42,22 @@ if  [ -f "/home/user/.gimp-2.6/sessionrc.orig" ] ; then
   mv /home/user/.gimp-2.6/sessionrc.orig /home/user/.gimp-2.6/sessionrc
 fi
 
-# if  [ -f "/home/user/.config/lxde/config.orig" ] ; then
-#  mv /home/user/.config/lxde/config.orig /home/user/.config/lxde/config
-# fi
+if  [ -f "/home/user/.config/lxde/config.orig" ] ; then
+  mv /home/user/.config/lxde/config.orig /home/user/.config/lxde/config
+fi
 
-# if  [ -f "/home/user/.config/lxpanel/LXDE/config.orig" ] ; then
-#   mv /home/user/.config/lxpanel/LXDE/config.orig /home/user/.config/lxpanel/LXDE/config
-# fi
+if  [ -f "/home/user/.config/lxpanel/LXDE/config.orig" ] ; then
+  mv /home/user/.config/lxpanel/LXDE/config.orig /home/user/.config/lxpanel/LXDE/config
+fi
 
-# if  [ -f "/home/user/.config/lxpanel/LXDE/panels/panel.orig" ] ; then
-#  mv /home/user/.config/lxpanel/LXDE/panels/panel.orig /home/user/.config/lxpanel/LXDE/panels/panel
-# fi
+if  [ -f "/home/user/.config/lxpanel/LXDE/panels/panel.orig" ] ; then
+  mv /home/user/.config/lxpanel/LXDE/panels/panel.orig /home/user/.config/lxpanel/LXDE/panels/panel
+fi
+
+if  [ -f "/home/user/.config/lxpanel/LXDE/panels/top.orig" ] ; then
+  rm /home/user/.config/lxpanel/LXDE/panels/top.orig
+#   mv /home/user/.config/lxpanel/LXDE/panels/top.orig /home/user/.config/lxpanel/LXDE/panels/top
+fi
 
 # if  [ -f "/home/user/.config/gtk-2.0/gtkfilechooser.ini.orig" ] ; then
 #  mv /home/user/.config/gtk-2.0/gtkfilechooser.ini.orig /home/user/.config/gtk-2.0/gtkfilechooser.ini
@@ -65,7 +74,7 @@ chown user:users /home/user/.gtkrc-2.0
 # chown -R user:users /home/user/apps
 # chown -R user:users /home/user/.matchbox
 # chown user:users /home/user/.Xmodmap-keymap
-# chown user:users /home/user/.xbindkeysrc.scm
+chown user:users /home/user/.xbindkeysrc
 
 # yet another kludge; detect an upgrade
 
@@ -85,31 +94,25 @@ if  [ ! -e "/usr/share/icons/hicolor/scalable/hildon/deblet-easydeb.png" ] ; the
 fi
 
 # this takes a while; that's why it's at the end...
-gtk-update-icon-cache -f /usr/share/icons/hicolor
-
-if [ "x$UPGRD" != "x" ] ; then
-  export MSG1=`printf "\
-This update fixes keyboard issues in LXDE under Fremantle.\n\n\
-If you want the new features, make sure you close your chroot, \n\
-delete the current image if you need the space, then use \n\
-the installer to download the new image file. \n\n\
-Note: You don't need to replace your current image file."`
-else
+# gtk-update-icon-cache -f /usr/share/icons/hicolor
+
+if [ "x$UPGRD" = "x" ] ; then
 export MSG1=`printf "\
 In order to use this package, you must download and\n\
 install a very large image file. If you are unsure about\n\
 how to do this, and / or you just want the current set of\n\
 Debian applications (OpenOffice, GIMP & Firefox 3  w/ java),\n\
-use the Debian Image Installer in the Extras menu.\n\
+use the Deb Img Install in the menu.\n\
 This program will download and install the image file to\n\
-one of your SD cards. You will need at least 1.5 GB free on that\n\
-card. After you download the image, you can move it elsewhere.\n\
+MyDocs or a microSD card. You will need at least 2.5 GB free\n\
+there. After you download the image, you can move it elsewhere.\n\
 After moving the file, you may need to edit the .chroot file \n\
-as explained on ITt.\n\
+as explained on talk.maemo.org.\n\
 If you have run any Debian apps, be sure to issue\n\
 sudo closechroot\n\
 in the terminal (or just reboot) before moving the image file.\n"`
-fi
+
 gxmessage -center -alignbuttons center -buttons OK:0 -geometry 690x380 -title "NOTICE" "$MSG1"
 
+fi
 exit 0
\ No newline at end of file