From: N900 Easy Debian User Date: Sat, 27 Feb 2010 16:39:07 +0000 (-0800) Subject: Fremantle updates: easy-chroot 0.2.7, easy-deb-chroot 0.9.42 X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;ds=sidebyside;h=f2bac74be02abdb9577c5caee98db6a78e878881;p=easy-deb-chroot Fremantle updates: easy-chroot 0.2.7, easy-deb-chroot 0.9.42 --- diff --git a/fremantle/easy-chroot/build_easychroot.py b/fremantle/easy-chroot/build_easychroot.py index 1887460..031a7b5 100755 --- a/fremantle/easy-chroot/build_easychroot.py +++ b/fremantle/easy-chroot/build_easychroot.py @@ -20,10 +20,12 @@ if __name__ == "__main__": pass print p=py2deb.Py2deb("easy-chroot") #This is the package name and MUST be in lowercase! - p.description="Scripts to mount and chroot into images/partitions\nFremantle version;\n(This does NOT use the 'turbo-charged' dm-loop for mounting image files.)" + qoledescript = open("control/description", "r") + p.description=qoledescript.read() + p.xsbc_bugtracker="https://garage.maemo.org/tracker/?atid=3577&group_id=953&func=browse" p.maemodispname="Easy Chroot" p.author="Alan Bruce (qole)" - p.mail="alan@thebruces.ca" + p.mail="qole@qole.org" p.depends = "libblkid1" p.section="user/system" p.icon = "cigar-48.png" @@ -40,14 +42,12 @@ if __name__ == "__main__": # p.preinstall="" # p.preremove="" - version = "0.2.3" #Version of your software, e.g. "1.2.0" or "0.8.2" + version = "0.2.7" #Version of your software, e.g. "1.2.0" or "0.8.2" build = "1fremantle1" #Build number versionbuild = version + "-" + build #Text with changelog information to be displayed in the package "Details" tab of the HAM - oldchangelog = "0.2.1: First version for Fremantle, fifth package. Trying a new version of py2deb." - newchanges = "0.2.2: Added thp's patches, some other fixes." - changeloginformation = oldchangelog + "\n" + newchanges - # changelog="control/changelog" + qolechangelog = open("control/changelog", "r") + changeloginformation = qolechangelog.read() dir_name = "src" #Name of the subfolder containing your package source files #Thanks to DareTheHair from talk.maemo.org for this snippet that recursively builds the file list diff --git a/fremantle/easy-chroot/control/changelog b/fremantle/easy-chroot/control/changelog index 7b9b6de..0f4ce79 100644 --- a/fremantle/easy-chroot/control/changelog +++ b/fremantle/easy-chroot/control/changelog @@ -1 +1,7 @@ -First version for Fremantle, fifth package. Trying a new version of py2deb. \ No newline at end of file +0.2.1: First version for Fremantle, fifth package. Trying a new version of py2deb.
+0.2.2: Added thp's patches, some other fixes.
+0.2.3: First version in Extras!
+0.2.4: Fixed some small bugs and added a bugtracker field.
+0.2.5: Unmount /dev/shm in the closechroot script
+0.2.6: Include Debian's fuser as a workaround for broken busybox
+0.2.7: Remove the closechroot .desktop file, move to Easy Debian
\ No newline at end of file diff --git a/fremantle/easy-chroot/control/description b/fremantle/easy-chroot/control/description new file mode 100644 index 0000000..86c039d --- /dev/null +++ b/fremantle/easy-chroot/control/description @@ -0,0 +1,7 @@ +Scripts to mount and chroot into images/partitions, Fremantle version. +--- +This package provides the infrastructure for Easy Debian, +but it can be used for other purposes, like mounting a CD-ROM image +or setting up an on-device SDK for app development. +--- +(If that didn't make any sense to you, don't install this) \ No newline at end of file diff --git a/fremantle/easy-chroot/src/bin/gfuser b/fremantle/easy-chroot/src/bin/gfuser new file mode 100755 index 0000000..e0a0d2e Binary files /dev/null and b/fremantle/easy-chroot/src/bin/gfuser differ diff --git a/fremantle/easy-chroot/src/sbin/closechroot b/fremantle/easy-chroot/src/sbin/closechroot index 9a4efdb..eda7e9e 100755 --- a/fremantle/easy-chroot/src/sbin/closechroot +++ b/fremantle/easy-chroot/src/sbin/closechroot @@ -29,14 +29,24 @@ fi echo "Closing the chroot..." -# +# Fremantle's fuser command is broken. +# Using Debian's one instead. + +echo "...closing chroot apps..." TEST1=`mount | grep " $CHROOT "` if [ "x$TEST1" != "x" ] ; then - echo "...Killing chroot apps..." - fuser -m "$CHROOT" -k + if [ -f "/bin/gfuser" ] ; then + gfuser -m "$CHROOT" -k + else + fuser -m "$CHROOT" -k + fi else - fuser "$CHROOT" -k + if [ -f "/bin/gfuser" ] ; then + gfuser "$CHROOT" -k + else + fuser "$CHROOT" -k + fi fi echo "..Unmounting bound dirs..." @@ -45,6 +55,7 @@ echo "..Unmounting bound dirs..." umount -fl $CHROOT/home/user/MyDocs umount -fl $CHROOT/dev/pts +umount -fl $CHROOT/dev/shm MNTD=`cat /proc/mounts | grep " $CHROOT/" | awk '{print $2}'` for MDRV in $MNTD ; do diff --git a/fremantle/easy-chroot/src/sbin/qchroot b/fremantle/easy-chroot/src/sbin/qchroot index 2143465..799ae5b 100755 --- a/fremantle/easy-chroot/src/sbin/qchroot +++ b/fremantle/easy-chroot/src/sbin/qchroot @@ -45,6 +45,10 @@ if [ "$MOUNTSUCCESS" = "0" ] ; then #Open e-mail attachments, etc mount -o bind /var/tmp "$CHROOT/var/tmp" + #ArchLinux suggestions + mount -o bind /dev/shm "$CHROOT/dev/shm" + mount -o bind /sys "$CHROOT/sys" + #Any external devices echo ... >/dev/stderr MNTD=`cat /proc/mounts | grep ' /media/' | awk '{print $2}'` @@ -66,8 +70,9 @@ if [ "$MOUNTSUCCESS" = "0" ] ; then #Make DBus work mount -o bind /var/run/dbus "$CHROOT/var/run/dbus" + mount -o bind /var/lib/dbus "$CHROOT/var/lib/dbus" - #Make DBus work + #Make pulseaudio work mount -o bind /var/run/pulse "$CHROOT/var/run/pulse" #Speed hacks: lower the priority of processes @@ -121,11 +126,20 @@ fi trap "rm -f $CHROOT/var/lock/chroot-complete ; echo -ne '\033]0;osso_xterm\007' ; exit" INT TERM EXIT echo $IMGFILE $@ > "$CHROOT/var/lock/chroot-complete" +#If the file is mounted on loop, use that label. + #Custom prompt and xterm title. Reduces confusion. CHRLABEL=`blkid -s LABEL $IMGFILE | cut -d' ' -f2 | cut -d'=' -f2 | sed 's/"//g'` + +#If the file is mounted on loop, use that label. +if [ "x$CHRLABEL" = "x" ] ; then + CHRLABEL=`blkid -s LABEL /dev/loop0 | cut -d' ' -f2 | cut -d'=' -f2 | sed 's/"//g'` +fi + if [ "x$CHRLABEL" = "x" ] ; then CHRLABEL=chroot fi + echo -ne "\033]0;$CHRLABEL\007" >/dev/stderr export PS1="[\u@$CHRLABEL: \w]" diff --git a/fremantle/easy-chroot/src/sbin/qmount b/fremantle/easy-chroot/src/sbin/qmount index 348bd9d..9a92802 100755 --- a/fremantle/easy-chroot/src/sbin/qmount +++ b/fremantle/easy-chroot/src/sbin/qmount @@ -114,7 +114,7 @@ if [ ! -f "$MNTPT/var/lock/qmount-complete" ] ; then if [ "$LOOP" = "loop," ] ; then #echo "mounting $IMGFILE on the turbo-loop ;)" - echo "mounting $IMGFILE on the slow Fremantle-loop ;)" >/dev/stderr + echo "mounting $IMGFILE on loop" >/dev/stderr #insmod /lib/modules/2.6.21-omap1/dm-mod.ko 2>/dev/null #insmod /lib/modules/2.6.21-omap1/dm-loop.ko 2>/dev/null #NEXTLOOP=`ls -l /dev/dm-* 2>/dev/null | tail -1 | awk '{print $NF}' | awk -F '-' '{print $NF+1}'` diff --git a/fremantle/easy-chroot/src/usr/share/applications/hildon/closechroot.desktop b/fremantle/easy-chroot/src/usr/share/applications/hildon/closechroot.desktop deleted file mode 100644 index 0799e3e..0000000 --- a/fremantle/easy-chroot/src/usr/share/applications/hildon/closechroot.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Close Debian -GenericName=Close Debian -Exec=osso-xterm 'sudo closechroot' -Icon=deblet -X-Osso-Type=application/x-executable -X-HildonDesk-ShowInToolbar=true -Type=Application -StartupNotify=true \ No newline at end of file diff --git a/fremantle/easy-deb-chroot/build_easydebchroot.py b/fremantle/easy-deb-chroot/build_easydebchroot.py index 3d83087..4628399 100755 --- a/fremantle/easy-deb-chroot/build_easydebchroot.py +++ b/fremantle/easy-deb-chroot/build_easydebchroot.py @@ -20,11 +20,17 @@ if __name__ == "__main__": pass print p=py2deb.Py2deb("easy-deb-chroot") #This is the package name and MUST be in lowercase! - p.description="Scripts to run Debian applications easily in maemo\n for users not familiar with the command line.\n NB: A large image file must be downloaded\n and installed before this package will work!\n You will need approx. 1.5 GB free in either\n your MyDocs directory or your MicroSD card.\n Instructions and an automated installer\n are provided in the package.\n (This is the Easy Debian 'Stable Lenny' Fremantle version.)" - + qoledescript = open("control/description", "r") + p.description=qoledescript.read() + p.xsbc_bugtracker="http://talk.maemo.org/showthread.php?t=34550" + p.maemodispname="Easy Debian" + version = "0.9.42" #Version of your software, e.g. "1.2.0" or "0.8.2" + build = "1fremantle1" #Build number + qolechangelog = open("control/changelog", "r") + changeloginformation = qolechangelog.read() p.author="Alan Bruce (qole)" - p.mail="alan@thebruces.ca" - p.depends = "easy-chroot, bzip2, wget" + p.mail="qole@qole.org" + p.depends = "easy-chroot (>=0.2.7), lzma, wget" p.section="user/system" p.icon = "deblet-48.png" p.arch="armel" #should be all for python, any for all arch @@ -43,12 +49,6 @@ if __name__ == "__main__": qoleprerm = open("control/prerm", "r") p.preremove=qoleprerm.read() # p.preremove="" - - version = "0.9.35" #Version of your software, e.g. "1.2.0" or "0.8.2" - build = "3fremantle1" #Build number - #Text with changelog information to be displayed in the package "Details" tab of the HAM - qolechangelog = open("control/changelog", "r") - changeloginformation = qolechangelog.read() dir_name = "src" #Name of the subfolder containing your package source files #Thanks to DareTheHair from talk.maemo.org for this snippet that recursively builds the file list diff --git a/fremantle/easy-deb-chroot/control/changelog b/fremantle/easy-deb-chroot/control/changelog index 11bec93..d4fc055 100644 --- a/fremantle/easy-deb-chroot/control/changelog +++ b/fremantle/easy-deb-chroot/control/changelog @@ -1,3 +1,2 @@ -0.9.30 First version for Fremantle. Stripped down, but works. -0.9.34 Using a hack by qobi, LXDE in Xephyr works now! -0.9.35 Fixed the image installer script. The 2G file is "too large" \ No newline at end of file +0.9.41: Fixed closechroot icon conflict with easy-chroot pkg +0.9.42: Changed icon and .desktop name for Evince to avoid conflict with Maemo pkg, improved installer. diff --git a/fremantle/easy-deb-chroot/control/changelog.old b/fremantle/easy-deb-chroot/control/changelog.old new file mode 100644 index 0000000..2959ce4 --- /dev/null +++ b/fremantle/easy-deb-chroot/control/changelog.old @@ -0,0 +1,8 @@ +0.9.30 First version for Fremantle. Stripped down, but works.
+0.9.34 Using a hack by qobi, LXDE in Xephyr works now!
+0.9.35 Fixed the image installer script. The 2G file is "too large"
+0.9.36 Changed default mount point to /.debian
+0.9.37 Fixed the closechroot icon, added back oo icon & fullscreen key
+0.9.38 Fixed top menu in LXDE and added ctrl-space fullscreen key.
+0.9.39 Tweaked top menu in LXDE
+0.9.40 New image (m5-v3), new icons for HW keys, closechroot and Evince, improved installer
diff --git a/fremantle/easy-deb-chroot/control/description b/fremantle/easy-deb-chroot/control/description new file mode 100644 index 0000000..a003f44 --- /dev/null +++ b/fremantle/easy-deb-chroot/control/description @@ -0,0 +1,11 @@ +Scripts to run Debian applications easily in Maemo +for users not familiar with the command line. +--- +NOTE: A large image file must be downloaded +and installed before this package will work! +You will need approx. 2.5 GB free in either +your MyDocs directory or your MicroSD card. +BE AWARE: Downloading and extracting can take +more than an hour and will need a fast connection! +Instructions and an automated installer +are provided in the package. \ No newline at end of file diff --git a/fremantle/easy-deb-chroot/control/postinst b/fremantle/easy-deb-chroot/control/postinst index a66e2ec..a7cc187 100644 --- a/fremantle/easy-deb-chroot/control/postinst +++ b/fremantle/easy-deb-chroot/control/postinst @@ -2,7 +2,7 @@ closechroot -set -e +# set -e CHROOT=/.debian TSTFILE=/usr/bin/hilda @@ -29,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 @@ -41,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 @@ -68,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 @@ -88,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 diff --git a/fremantle/easy-deb-chroot/control/postrm b/fremantle/easy-deb-chroot/control/postrm index fe437e2..6534c95 100644 --- a/fremantle/easy-deb-chroot/control/postrm +++ b/fremantle/easy-deb-chroot/control/postrm @@ -1,5 +1,8 @@ #!/bin/sh +UPGRADE=$1 +if [ "$UPGRADE" = "remove" ] ; then + export MSG1=`printf "\ Removing this package does NOT delete the large image file\n\ named debian-stable.img.ext2 from your SD card. You can do this\n\ @@ -8,4 +11,6 @@ before you are allowed to delete the file."` echo $MSG1 > /tmp/msg.txt maemo-confirm-text "Notice" /tmp/msg.txt +fi + exit 0 \ No newline at end of file diff --git a/fremantle/easy-deb-chroot/control/preinst b/fremantle/easy-deb-chroot/control/preinst index 518f10d..8e4d804 100644 --- a/fremantle/easy-deb-chroot/control/preinst +++ b/fremantle/easy-deb-chroot/control/preinst @@ -7,12 +7,12 @@ if [ -f "/home/user/.chroot" ] ; then cp /home/user/.chroot /home/user/.chroot.orig fi -if [ -f "/home/user/.Xmodmap-keymap" ] ; then - cp /home/user/.Xmodmap-keymap /home/user/.Xmodmap-keymap.orig -fi +# if [ -f "/home/user/.Xmodmap-keymap" ] ; then +# cp /home/user/.Xmodmap-keymap /home/user/.Xmodmap-keymap.orig +# fi -if [ -f "/home/user/.xbindkeysrc.scm" ] ; then - cp /home/user/.xbindkeysrc.scm /home/user/.xbindkeysrc.scm.orig +if [ -f "/home/user/.xbindkeysrc" ] ; then + cp /home/user/.xbindkeysrc /home/user/.xbindkeysrc.orig fi if [ -f "/home/user/.gimp-2.4/gimprc" ] ; then @@ -35,6 +35,10 @@ if [ -f "/home/user/.config/lxpanel/LXDE/panels/panel" ] ; then cp /home/user/.config/lxpanel/LXDE/panels/panel /home/user/.config/lxpanel/LXDE/panels/panel.orig fi +if [ -f "/home/user/.config/lxpanel/LXDE/panels/top" ] ; then + cp /home/user/.config/lxpanel/LXDE/panels/top /home/user/.config/lxpanel/LXDE/panels/top.orig +fi + if [ -f "/home/user/.config/gtk-2.0/gtkfilechooser.ini" ] ; then cp /home/user/.config/gtk-2.0/gtkfilechooser.ini /home/user/.config/gtk-2.0/gtkfilechooser.ini.orig fi diff --git a/fremantle/easy-deb-chroot/debian-m5-v2.img.ext2.bz2.md5sum b/fremantle/easy-deb-chroot/debian-m5-v2.img.ext2.bz2.md5sum deleted file mode 100644 index f569cc9..0000000 --- a/fremantle/easy-deb-chroot/debian-m5-v2.img.ext2.bz2.md5sum +++ /dev/null @@ -1 +0,0 @@ -1c02d35d6453fd35390ae025bd930ba2 diff --git a/fremantle/easy-deb-chroot/src/home/user/.config/lxpanel/LXDE/panels/top b/fremantle/easy-deb-chroot/src/home/user/.config/lxpanel/LXDE/panels/top index a1d6a01..b83d774 100644 --- a/fremantle/easy-deb-chroot/src/home/user/.config/lxpanel/LXDE/panels/top +++ b/fremantle/easy-deb-chroot/src/home/user/.config/lxpanel/LXDE/panels/top @@ -6,16 +6,19 @@ Global { allign=left margin=0 widthtype=percent - width=28 + width=25 height=32 transparent=0 tintcolor=#000000 alpha=0 + autohide=0 + heightwhenhidden=2 setdocktype=1 setpartialstrut=0 usefontcolor=0 fontcolor=#000000 background=0 + iconsize=24 } Plugin { @@ -41,18 +44,28 @@ Plugin { Plugin { type = dclock Config { - ClockFmt=%R - TooltipFmt=%A %x BoldFont=0 + IconOnly=0 } } Plugin { type = tray - expand=1 +} + +Plugin { + type = netstatus + Config { + iface=wlan0 + configtool=network-admin --configure %i + } } Plugin { type = cpu } +Plugin { + type = separator +} + diff --git a/fremantle/easy-deb-chroot/src/home/user/.xbindkeysrc b/fremantle/easy-deb-chroot/src/home/user/.xbindkeysrc new file mode 100644 index 0000000..f01c392 --- /dev/null +++ b/fremantle/easy-deb-chroot/src/home/user/.xbindkeysrc @@ -0,0 +1,66 @@ +Mounting... +Using ext2 file system +# For the benefit of emacs users: -*- shell-script -*- +########################### +# xbindkeys configuration # +########################### +# +# Version: 1.8.2 +# +# If you edit this file, do not forget to uncomment any lines +# that you change. +# The pound(#) symbol may be used anywhere for comments. +# +# To specify a key, you can use 'xbindkeys --key' or +# 'xbindkeys --multikey' and put one of the two lines in this file. +# +# The format of a command line is: +# "command to start" +# associated key +# +# +# A list of keys is in /usr/include/X11/keysym.h and in +# /usr/include/X11/keysymdef.h +# The XK_ is not needed. +# +# List of modifier: +# Release, Control, Shift, Mod1 (Alt), Mod2 (NumLock), +# Mod3 (CapsLock), Mod4, Mod5 (Scroll). +# + +# The release modifier is not a standard X modifier, but you can +# use it if you want to catch release events instead of press events + +# By defaults, xbindkeys does not pay attention with the modifiers +# NumLock, CapsLock and ScrollLock. +# Uncomment the lines above if you want to pay attention to them. + +#keystate_numlock = enable +#keystate_capslock = enable +#keystate_scrolllock= enable + + "wmctrl -r :ACTIVE: -b toggle,fullscreen" + m:0x4 + c:111 + Control + Up + + "wmctrl -r :ACTIVE: -b toggle,fullscreen" + m:0x4 + c:65 + Control + space + + +# Examples of commands: + +#"xbindkeys_show" +# control+shift + q + +# set directly keycode (here control + f with my keyboard) +#"xterm" +# c:41 + m:0x4 + +# specify a mouse button +#"xterm" +# control + b:2 + +################################## +# End of xbindkeys configuration # +################################## \ No newline at end of file diff --git a/fremantle/easy-deb-chroot/src/home/user/img-install/debian-installer.sh b/fremantle/easy-deb-chroot/src/home/user/img-install/debian-installer.sh index 1b3780a..0bb0979 100755 --- a/fremantle/easy-deb-chroot/src/home/user/img-install/debian-installer.sh +++ b/fremantle/easy-deb-chroot/src/home/user/img-install/debian-installer.sh @@ -1,58 +1,86 @@ #!/bin/sh +## Download the list of images. Also use this opportunity to check +## the Internet connection and availability of the server. + +IMGLIST="imagelist-0.9.40" + +mv $IMGLIST $IMGLIST.old +wget -t 3 http://qole.org/$IMGLIST +if [ $? != 0 ] ; then + MSG1=`printf "\ +Cannot download the list of available images.\n\ +$? \ +Something is wrong with either your Internet connection\n\ +or the qole.org file server.\n\n\ +Check your Internet connection and the status\n\ +of the server by browsing to http://qole.org"` + gxmessage -center -alignbuttons right -buttons GTK_STOCK_OK:0 -geometry 640x250 -title "Download Error" "$MSG1" + exit +fi + +gxmessage -buttons \ + "`awk -F ',' '/^[0-9],/ {print $2":"$1","}' $IMGLIST`Cancel:0" \ + "`awk -F ',' '/^[0-9],/ {print $2":"$6}' $IMGLIST`" +IMGCHOICE=$? + +#Both 0 and 1 are Cancel + +if [ "$IMGCHOICE" -le "1" ] ; then + exit 9 +fi + +DLURL=`awk -F"," '$1=='$IMGCHOICE' {print $3}' $IMGLIST` +PKGNAME1=`awk -F"," '$1=='"$IMGCHOICE"' {print $6}' $IMGLIST` +BIGTAR1=`awk -F"," '$1=='"$IMGCHOICE"' {print $4"."$5}' $IMGLIST` +BIGIMG1=`awk -F"," '$1=='"$IMGCHOICE"' {print $4}' $IMGLIST` +MD51=`awk -F"," '$1=='"$IMGCHOICE"' {print $7}' $IMGLIST` +IMGCMPRSS=`awk -F"," '$1=='"$IMGCHOICE"' {print $5}' $IMGLIST` + +#echo $DLURL +#echo $PKGNAME1 +#echo $BIGTAR1 +#echo $BIGIMG1 +#echo $MD51 +#echo $IMGCMPRSS + +## Make sure the chroot is closed, to avoid spurious mounts + +sudo closechroot >/dev/null + ## Ask where the user wishes to install the package with gxmessage: export GXMSG=`printf "\ Where do you want your Debian image file installed?\n\ -You need approximately 1.3GB initially.\n\ +You need approximately 2.3GB initially.\n\ Free space left in internal memory or your memory card:\n\n"; \ df -h | grep "mmcblk.p1" | awk '{print $6 ": " $4 " free, " $2 " total (" $5 " full)"}' | sort` -gxmessage -center -buttons MyDocs:1,MicroSD:2 -geometry 690x380 -title "Choose Memory Card" "$GXMSG" +gxmessage -center -buttons MyDocs:2,MicroSD:3 -geometry 690x380 -title "Choose Memory Card" "$GXMSG" export SDNO=$? case "$SDNO" in - 1) + 2) export SDCARD="/home/user/MyDocs" ;; - *) + 3) export SDCARD="/media/mmc1" ;; + *) + exit 9 + ;; esac -echo "Downloading and extracting to $SDCARD..." +echo "Downloading and extracting $BIGIMG1 to $SDCARD..." -#exit 0 +# exit 0 -## HERE ARE THE VARIABLES: +## HERE ARE THE REST OF THE VARIABLES: export INSTPATH="/home/user/img-install" export TARPATH="$SDCARD" -export DLURL="http://qole.org/files" -#This doesn't work: -export GZCMD1="tar -xzf" - export EXTPATH1=$TARPATH -export PKGNAME1="EASY DEBIAN IMAGE FILE" -export BIGTAR1="debian-m5-v2.img.ext2.bz2" -export BIGIMG1="debian-m5-v2.img.ext2" -# export BZ2CMD1="bzip2 -d " -# export BZ2CMD2=" > $TARPATH/$BIGIMG1" -# export BZ2CMD1="cat " -# export BZ2CMD2=" | bunzip2 > " -# export TARCMD1="cat $TARPATH/$BIGTAR1 | bunzip2 > $TARPATH/$BIGIMG1" -export MD51="1c02d35d6453fd35390ae025bd930ba2" export EXTCMD1="" -#Set SKIPPKG2=1 to skip the second package. - -export SKIPPKG2=1 -export EXTPATH2=$EXTPATH1 -export PKGNAME2="SECOND TEST" -export BIGTAR2="test2.tgz" -export TARCMD2="$GZCMD1 $TARPATH/$BIGTAR2" -export MD52="ec3ccde37f4cd026fd03911df7579d6a" -export EXTCMD2="" - #export CLEANUP="sudo rm -r $INSTPATH ; sudo rm /usr/share/applications/image-install.desktop " export CLEANUP="echo All done!" @@ -60,6 +88,9 @@ export CLEANUP="echo All done!" # Download first package +echo " " +echo "Downloading $PKGNAME1 package..." + export GOTIT="no" if [ -f $TARPATH/$BIGTAR1 ] ; then @@ -70,9 +101,6 @@ if [ -f $TARPATH/$BIGTAR1 ] ; then fi fi -echo " " -echo "Downloading $PKGNAME1 package..." - export GOOD=1 export TEST=2 @@ -99,23 +127,30 @@ do then cd $EXTPATH1 - echo Extracting the image file. This will take some time. - # echo $TARCMD1 - # echo 'cat $TARPATH/$BIGTAR1 | bunzip2 > $TARPATH/$BIGIMG1' - # TARERR=`$TARCMD1 2>&1` - TARERR="Unknown bzip2 error" +# Warn the user that the decompression is going to take a long time. + + export MSG1=`printf "\ +Extracting the image file.\n\ +This could take a very long time and could\n\ +cause your device to become unresponsive."` + gxmessage -center -alignbuttons right -buttons GTK_STOCK_OK:0 -geometry 640x250 -title "Decompressing" "$MSG1" & + + echo " " + echo "Extracting $BIGTAR1 package..." + + TARERR="Unknown lzma error" # read -p 'press enter' key #$TARCMD1 - cat $TARPATH/$BIGTAR1 | bunzip2 > $TARPATH/$BIGIMG1 + lzma -kd $TARPATH/$BIGTAR1 if [ "$?" = 0 ] ; then rm -rf $TARPATH/$BIGTAR1 $EXTCMD1 export MSG1=`printf "CONGRATULATIONS!\n\nAll has gone well!\n\nSuccess installing $PKGNAME1 package!"` gxmessage -center -alignbuttons right -buttons GTK_STOCK_OK:0 -geometry 640x250 -title "SUCCESS!" "$MSG1" else - export ERR1=`printf "ERROR! TAR FAILED!\nUnable to install $PKGNAME1\n$TARERR"` - gxmessage -center -alignbuttons right -buttons GTK_STOCK_OK:0 -geometry 640x380 -title "TAR ERROR" "$ERR1" + export ERR1=`printf "ERROR! DECOMPRESSION FAILED!\nUnable to install $PKGNAME1\n$TARERR"` + gxmessage -center -alignbuttons right -buttons GTK_STOCK_OK:0 -geometry 640x380 -title "DECOMPRESSION ERROR" "$ERR1" exit 99 fi else @@ -129,50 +164,5 @@ do fi done -# Stop if only getting one package - -if test $SKIPPKG2 == 1 - then - $CLEANUP - exit 0 -fi - -# Download second package - -echo " " -echo "Downloading $PKGNAME2 package..." -export GOOD2=1 -export TEST2=2 - -while test $TEST2 != $GOOD2 -do - cd $INSTPATH - wget -c $DLURL/$BIGTAR2 - if test -e $TARPATH/$BIGTAR2 - then - - export GOOD2=$MD52 - export TEST2=`$INSTPATH/md5sum $TARPATH/$BIGTAR2 | awk '{print $1}'` - - if test $TEST2 = $GOOD2 - then - cd $EXTPATH2 - TARERR=`$TARCMD2 2>&1` - if [ "$?" = 0 ] ; then - rm -rf $TARPATH/$BIGTAR2 - $EXTCMD2 - export MSG2=`printf "CONGRATULATIONS!\n\nAll has gone well!\n\nSuccess installing $PKGNAME2 package!"` - gxmessage -center -alignbuttons right -buttons GTK_STOCK_OK:0 -geometry 640x250 -title "SUCCESS!" "$MSG2" - else - export ERR2=`printf "ERROR! ERROR! ERROR!\nTAR FAILED!\n\nUnable to install $PKGNAME2\n\n$TARERR"` - gxmessage -center -alignbuttons right -buttons GTK_STOCK_OK:0 -geometry 640x250 -title "TAR ERROR" "$ERR2" - exit 99 - fi - else - echo "$PKGNAME2 package seems damaged, trying again!" - fi - fi -done - $CLEANUP exit 0 diff --git a/fremantle/easy-deb-chroot/src/sbin/debian b/fremantle/easy-deb-chroot/src/sbin/debian index 01659da..a9e60f9 100755 --- a/fremantle/easy-deb-chroot/src/sbin/debian +++ b/fremantle/easy-deb-chroot/src/sbin/debian @@ -23,7 +23,7 @@ fi #This comes from the config file... If not, fall back on '/debian' if [ "x$CHROOT" = "x" ] ; then - CHROOT=/debian + CHROOT=/.debian echo "No chroot dir specified; using $CHROOT" >/dev/stderr else echo "Chroot dir specified: $CHROOT" >/dev/stderr diff --git a/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/closechroot.desktop b/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/closechroot.desktop new file mode 100644 index 0000000..1b848cb --- /dev/null +++ b/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/closechroot.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Close Debian +GenericName=Close Debian +Exec=osso-xterm 'sudo closechroot' +Icon=closechroot64 +X-Osso-Type=application/x-executable +X-HildonDesk-ShowInToolbar=true +Type=Application +StartupNotify=true \ No newline at end of file diff --git a/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/debevince.desktop b/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/debevince.desktop new file mode 100644 index 0000000..5819754 --- /dev/null +++ b/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/debevince.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Evince Doc Reader +GenericName=Document Reader +Exec=debbie evince +Icon=evince +X-Osso-Type=application/x-executable +X-HildonDesk-ShowInToolbar=true +Terminal=true +Type=Application +StartupNotify=true \ No newline at end of file diff --git a/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/image-install.desktop b/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/image-install.desktop index 23a237d..5c7fee7 100644 --- a/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/image-install.desktop +++ b/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/image-install.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Name=Debian Image Installer +Name=Deb Img Install GenericName=Debian Image Installer Comment=Install Debian chroot image Exec=osso-xterm /home/user/img-install/debian-installer.sh diff --git a/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/lxdefocus.desktop b/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/lxdefocus.desktop index f897810..ebf2f9d 100644 --- a/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/lxdefocus.desktop +++ b/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/lxdefocus.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Name=Fix LXDE keyboard +Name=Fix LXDE kbd GenericName=Fix LXDE keyboard Exec=/usr/bin/debbie xephfocus Icon=fix-kbd-focus diff --git a/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/ooo.desktop b/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/ooo.desktop new file mode 100644 index 0000000..291cf98 --- /dev/null +++ b/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/ooo.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=OpenOffice +GenericName=OpenOffice +Exec=debbie openoffice.org +Icon=ooo-gulls +X-Osso-Type=application/x-executable +X-HildonDesk-ShowInToolbar=true +Terminal=true +Type=Application +StartupNotify=true \ No newline at end of file diff --git a/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/synaptic.desktop b/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/synaptic.desktop index c3e6126..83cd169 100644 --- a/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/synaptic.desktop +++ b/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/synaptic.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Name=Synaptic Package Manager +Name=Synaptic Pkg Mgr GenericName=Package Manager Comment=Install, remove and upgrade software packages Exec=sudo debian /usr/sbin/synaptic diff --git a/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/xbindkeys.desktop b/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/xbindkeys.desktop new file mode 100644 index 0000000..70f519b --- /dev/null +++ b/fremantle/easy-deb-chroot/src/usr/share/applications/hildon/xbindkeys.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Set Deb HW Keys +GenericName=Set Debian HW Keys +Exec=osso-xterm 'debbie xbindkeys' +Icon=debian-hw-keys +X-Osso-Type=application/x-executable +X-HildonDesk-ShowInToolbar=true +Terminal=false +Type=Application +StartupNotify=true \ No newline at end of file diff --git a/fremantle/easy-deb-chroot/src/usr/share/icons/hicolor/scalable/apps/evince.png b/fremantle/easy-deb-chroot/src/usr/share/icons/hicolor/scalable/apps/evince.png new file mode 100644 index 0000000..f0b382f Binary files /dev/null and b/fremantle/easy-deb-chroot/src/usr/share/icons/hicolor/scalable/apps/evince.png differ diff --git a/fremantle/easy-deb-chroot/src/usr/share/icons/hicolor/scalable/hildon/closechroot64.png b/fremantle/easy-deb-chroot/src/usr/share/icons/hicolor/scalable/hildon/closechroot64.png new file mode 100644 index 0000000..e4152e8 Binary files /dev/null and b/fremantle/easy-deb-chroot/src/usr/share/icons/hicolor/scalable/hildon/closechroot64.png differ diff --git a/fremantle/easy-deb-chroot/src/usr/share/icons/hicolor/scalable/hildon/debevince.png b/fremantle/easy-deb-chroot/src/usr/share/icons/hicolor/scalable/hildon/debevince.png new file mode 100644 index 0000000..f0b382f Binary files /dev/null and b/fremantle/easy-deb-chroot/src/usr/share/icons/hicolor/scalable/hildon/debevince.png differ diff --git a/fremantle/easy-deb-chroot/src/usr/share/icons/hicolor/scalable/hildon/debian-hw-keys.png b/fremantle/easy-deb-chroot/src/usr/share/icons/hicolor/scalable/hildon/debian-hw-keys.png new file mode 100644 index 0000000..fcb2ffd Binary files /dev/null and b/fremantle/easy-deb-chroot/src/usr/share/icons/hicolor/scalable/hildon/debian-hw-keys.png differ diff --git a/fremantle/easy-deb-chroot/src/usr/share/icons/hicolor/scalable/hildon/debthunderbird.png b/fremantle/easy-deb-chroot/src/usr/share/icons/hicolor/scalable/hildon/debthunderbird.png new file mode 100644 index 0000000..a5dbf14 Binary files /dev/null and b/fremantle/easy-deb-chroot/src/usr/share/icons/hicolor/scalable/hildon/debthunderbird.png differ