diff --git a/Slax/debian/cleanup b/Slax/debian/cleanup index 05fdcf1..f6fe005 100644 --- a/Slax/debian/cleanup +++ b/Slax/debian/cleanup @@ -45,6 +45,17 @@ rm -Rf /usr/share/man/*_* rm -Rf /usr/share/icons/elementaryXubuntu-dark rm -Rf /usr/share/icons/gnome/256x256 +rm /usr/share/applications/compton.desktop +rm /usr/share/applications/debian-uxterm.desktop +rm /usr/share/applications/debian-xterm.desktop +rm /usr/share/applications/feh.desktop +rm /usr/share/applications/htop.desktop +rm /usr/share/applications/mc.desktop +rm /usr/share/applications/mcedit.desktop +rm /usr/share/applications/pcmanfm-desktop-pref.desktop +rm /usr/share/applications/python2.7.desktop +rm /usr/share/applications/vim.desktop + # Unzip gzipped files (man pages), so LZMA can compress 2times better. # First we fix symlinks, then uncompress files # $1 = search directory diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbappselect b/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbappselect index 04c33b4..f9fab96 100755 --- a/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbappselect +++ b/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbappselect @@ -1,10 +1,11 @@ #!/bin/bash COMMAND=$( - xlunch --input /etc/xlunch/entries.dsv --scroll \ + xlunch_genquick 64 | \ + xlunch --scroll \ --background /usr/share/wallpapers/slax_wallpaper.jpg --font DejaVuSans/11 \ --voidclickterminate --iconpadding 30 --textpadding 10 \ - --paddingswap --leastmargin 10 --hidemissing --iconsize 128 \ + --paddingswap --leastmargin 10 --hidemissing --iconsize 64 \ --highlight /usr/share/icons/hicolor/128x128/apps/xlunch_highlight.png \ --outputonly ) @@ -25,7 +26,7 @@ if [ "$Ndep" != "" -o "$cmd" = "man" -o "$cmd" = "mc" ]; then WAIT="" fi -if [ "$Xdep" = "" -a "$cmd" != "chromium" ]; then +if [ "$Xdep" = "" -a "$cmd" != "chromium" -a "$cmd" != "wicd-gtk" ]; then exec xterm -ls -e bash --login -c -- "echo $USER@$HOSTNAME:$PWD# '$COMMAND'; $COMMAND; $WAIT" else exec $COMMAND diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/share/applications/terminal.desktop b/Slax/debian/modules/03-desktop/rootcopy/usr/share/applications/terminal.desktop new file mode 100644 index 0000000..4005587 --- /dev/null +++ b/Slax/debian/modules/03-desktop/rootcopy/usr/share/applications/terminal.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Icon=terminal +Name=Terminal +Exec=xterm -ls +Terminal=false diff --git a/Slax/debian/modules/04-apps/rootcopy/usr/share/applications/leafpad.desktop b/Slax/debian/modules/04-apps/rootcopy/usr/share/applications/leafpad.desktop new file mode 100644 index 0000000..6cc5492 --- /dev/null +++ b/Slax/debian/modules/04-apps/rootcopy/usr/share/applications/leafpad.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Name=Text editor +Exec=leafpad +Icon=editor +Terminal=false diff --git a/Slax/debian/modules/04-apps/rootcopy/usr/share/applications/pcmanfm.desktop b/Slax/debian/modules/04-apps/rootcopy/usr/share/applications/pcmanfm.desktop new file mode 100644 index 0000000..23361e3 --- /dev/null +++ b/Slax/debian/modules/04-apps/rootcopy/usr/share/applications/pcmanfm.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Icon=system-file-manager +Name=File Manager +Exec=pcmanfm +Terminal=false diff --git a/Slax/debian/modules/04-apps/rootcopy/usr/share/applications/qalculate-gtk.desktop b/Slax/debian/modules/04-apps/rootcopy/usr/share/applications/qalculate-gtk.desktop new file mode 100644 index 0000000..afdec00 --- /dev/null +++ b/Slax/debian/modules/04-apps/rootcopy/usr/share/applications/qalculate-gtk.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Name=Calculator +Exec=qalculate-gtk +Icon=calculator +Terminal=false diff --git a/Slax/debian/modules/04-apps/rootcopy/usr/share/applications/wicd.desktop b/Slax/debian/modules/04-apps/rootcopy/usr/share/applications/wicd.desktop new file mode 100644 index 0000000..e73d036 --- /dev/null +++ b/Slax/debian/modules/04-apps/rootcopy/usr/share/applications/wicd.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Exec=wicd-gtk --no-tray +Icon=wicd-gtk +Name=Net Manager +Terminal=false diff --git a/Slax/debian/modules/04-apps/rootcopy/usr/share/icons/hicolor/128x128/apps/system-file-manager.png b/Slax/debian/modules/04-apps/rootcopy/usr/share/icons/hicolor/128x128/apps/system-file-manager.png new file mode 100644 index 0000000..33f9b0a Binary files /dev/null and b/Slax/debian/modules/04-apps/rootcopy/usr/share/icons/hicolor/128x128/apps/system-file-manager.png differ diff --git a/Slax/debian/modules/04-apps/rootcopy/usr/share/icons/hicolor/16x16/apps/system-file-manager.png b/Slax/debian/modules/04-apps/rootcopy/usr/share/icons/hicolor/16x16/apps/system-file-manager.png new file mode 100644 index 0000000..32d82e5 Binary files /dev/null and b/Slax/debian/modules/04-apps/rootcopy/usr/share/icons/hicolor/16x16/apps/system-file-manager.png differ diff --git a/Slax/debian/modules/04-apps/rootcopy/usr/share/icons/hicolor/24x24/apps/system-file-manager.png b/Slax/debian/modules/04-apps/rootcopy/usr/share/icons/hicolor/24x24/apps/system-file-manager.png new file mode 100644 index 0000000..1a94a20 Binary files /dev/null and b/Slax/debian/modules/04-apps/rootcopy/usr/share/icons/hicolor/24x24/apps/system-file-manager.png differ diff --git a/Slax/debian/modules/04-apps/rootcopy/usr/share/icons/hicolor/32x32/apps/system-file-manager.png b/Slax/debian/modules/04-apps/rootcopy/usr/share/icons/hicolor/32x32/apps/system-file-manager.png new file mode 100644 index 0000000..c211019 Binary files /dev/null and b/Slax/debian/modules/04-apps/rootcopy/usr/share/icons/hicolor/32x32/apps/system-file-manager.png differ diff --git a/Slax/debian/modules/04-apps/rootcopy/usr/share/icons/hicolor/48x48/apps/system-file-manager.png b/Slax/debian/modules/04-apps/rootcopy/usr/share/icons/hicolor/48x48/apps/system-file-manager.png new file mode 100644 index 0000000..8b45025 Binary files /dev/null and b/Slax/debian/modules/04-apps/rootcopy/usr/share/icons/hicolor/48x48/apps/system-file-manager.png differ diff --git a/Slax/debian/modules/04-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/editor.png b/Slax/debian/modules/04-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/editor.png new file mode 100644 index 0000000..d7689e0 Binary files /dev/null and b/Slax/debian/modules/04-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/editor.png differ diff --git a/Slax/debian/modules/04-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/system-file-manager.png b/Slax/debian/modules/04-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/system-file-manager.png new file mode 100644 index 0000000..aca5c1e Binary files /dev/null and b/Slax/debian/modules/04-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/system-file-manager.png differ diff --git a/Slax/debian/modules/05-chromium/build b/Slax/debian/modules/05-chromium/build index 46ac439..11eca71 100755 --- a/Slax/debian/modules/05-chromium/build +++ b/Slax/debian/modules/05-chromium/build @@ -11,4 +11,4 @@ mv /usr/bin/chromium /usr/bin/chromium-launcher (cd rootcopy && cp --parents -afr * /) chown -R guest.users /home/guest -savechanges /04-chromium.sb +savechanges /05-chromium.sb diff --git a/Slax/debian/modules/05-chromium/rootcopy/usr/share/applications/chromium.desktop b/Slax/debian/modules/05-chromium/rootcopy/usr/share/applications/chromium.desktop new file mode 100644 index 0000000..7aacb41 --- /dev/null +++ b/Slax/debian/modules/05-chromium/rootcopy/usr/share/applications/chromium.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Name=Web Browser +Exec=/usr/bin/chromium +Terminal=false +Icon=chromium diff --git a/config b/config index db4a6c7..c7d2792 100644 --- a/config +++ b/config @@ -12,7 +12,7 @@ # If you do not need booting from CD (eg you're booting only from USB) # then you can ignore recompiling isolinux.bin, just rename LIVEKITNAME # and you're done. -LIVEKITNAME="slax" +LIVEKITNAME="linux" # Kernel file, will be copied to your Live Kit # Your kernel must support aufs and squashfs. Debian Jessie's kernel is ready