diff --git a/Slax/debian/modules/03-desktop/build b/Slax/debian/modules/03-desktop/build index 2031d5c..406c868 100755 --- a/Slax/debian/modules/03-desktop/build +++ b/Slax/debian/modules/03-desktop/build @@ -8,7 +8,7 @@ VERSION=1.3.5 # first install stock version apt-get update -apt-get install --no-install-recommends --yes $NAME feh compton volumeicon-alsa murrine-themes leafpad qalculate-gtk scrot xdg-user-dirs +apt-get install --no-install-recommends --yes $NAME feh compton volumeicon-alsa murrine-themes leafpad qalculate-gtk scrot . ../../cleanup (cd rootcopy && cp --parents -afr * /) @@ -19,6 +19,25 @@ savechanges /$NAME-stock.sb cd / unsquashfs /$NAME-stock.sb +# create user directories +mkdir -p /squashfs-root/home/guest/Desktop +mkdir -p /squashfs-root/home/guest/Documents +mkdir -p /squashfs-root/home/guest/Downloads +mkdir -p /squashfs-root/home/guest/Music +mkdir -p /squashfs-root/home/guest/Pictures +mkdir -p /squashfs-root/home/guest/Public +mkdir -p /squashfs-root/home/guest/Templates +mkdir -p /squashfs-root/home/guest/Videos +ln -s /home/guest/Desktop /squashfs-root/root/Desktop +ln -s /home/guest/Documents /squashfs-root/root/Documents +ln -s /home/guest/Downloads /squashfs-root/root/Downloads +ln -s /home/guest/Music /squashfs-root/root/Music +ln -s /home/guest/Pictures /squashfs-root/root/Pictures +ln -s /home/guest/Public /squashfs-root/root/Public +ln -s /home/guest/Templates /squashfs-root/root/Templates +ln -s /home/guest/Videos /squashfs-root/root/Videos +chown -R guest.users /squashfs-root/home/guest + # then, we want to patch it to implement window resizing! # so we will recompile whole package diff --git a/Slax/debian/modules/03-desktop/rootcopy/home/guest/Downloads/.empty b/Slax/debian/modules/03-desktop/rootcopy/home/guest/Downloads/.empty deleted file mode 100644 index e69de29..0000000 diff --git a/Slax/debian/modules/03-desktop/rootcopy/root/Downloads b/Slax/debian/modules/03-desktop/rootcopy/root/Downloads deleted file mode 120000 index 3620fe7..0000000 --- a/Slax/debian/modules/03-desktop/rootcopy/root/Downloads +++ /dev/null @@ -1 +0,0 @@ -/home/guest/Downloads \ No newline at end of file diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbprintscreen b/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbprintscreen index 44245af..2fa57c9 100755 --- a/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbprintscreen +++ b/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbprintscreen @@ -1,10 +1,6 @@ #!/bin/bash -PICTURES=$(xdg-user-dir PICTURES) -if [ "$PICTURES" = "" ]; then - PICTURES=~/Pictures -fi - +PICTURES=~/Pictures mkdir -p $PICTURES cd $PICTURES