Add libinput-gestures and xfdashbord as "packages" as building is slowwww

Add infrastructure to install these "packages"
Try including plank settings again...
This commit is contained in:
SolidHal 2018-09-22 04:12:52 +00:00
parent 61f040d62b
commit fc9af80e19
7 changed files with 84 additions and 32 deletions

View File

@ -0,0 +1,21 @@
Both of these take a bit to build on the c201 and don't
build properly in the chroot so there precompiled versions here.
When PrawnOS has its own apt repos these will be available there...
If you want to build them yourself run:
For libinput-gestures:
sudo apt install -y libinput-tools xdotool build-essential
git clone http://github.com/bulletmark/libinput-gestures
cd libinput-gestures
sudo make install
For Xfdashboard:
apt-get install -y xfce4-dev-tools build-essential glib2.0 libglib2.0-dev xorg-dev libwnck-3-dev libclutter-1.0-dev libgarcon-1-0-dev libxfconf-0-dev libxfce4util-dev libxfce4ui-2-dev libxcomposite-dev libxdamage-dev libxinerama-dev
git clone https://github.com/gmc-holle/xfdashboard
#get most recent version I've tested
cd xfdashboard
git checkout a7851d82ec89b3cd49952c6022813bbe6b8b0bc9
sudo ./autogen.sh
sudo make
sudo make install

View File

@ -0,0 +1,21 @@
[net/launchpad/plank/docks/dock1]
icon-size=48
show-dock-item=false
position='bottom'
dock-items=['xfcalendar.dockitem', 'vlc.dockitem', 'ristretto.dockitem', 'xfce4-terminal.dockitem', 'mousepad.dockitem', 'Thunar.dockitem']
unhide-delay=0
items-alignment='center'
theme='Transparent'
hide-mode='intelligent'
pinned-only=true
auto-pinning=true
alignment='center'
zoom-percent=150
hide-delay=0
zoom-enabled=false
monitor=''
lock-items=false
tooltips-enabled=true
pressure-reveal=false
offset=0
current-workspace-only=false

View File

@ -13,27 +13,47 @@ done
locale-gen
#Install shared packages
apt install -y xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils xserver-xorg-input-synaptics mousepad vlc dconf-tools sudo
apt install -y xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils xserver-xorg-input-synaptics mousepad vlc dconf-tools sudo dtrx
apt install -y network-manager-gnome network-manager-openvpn
[ "$DE" = "xfce" ] && apt install -y xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies numix-gtk-theme plank
[ "$DE" = "lxqt" ] && apt install -y lxqt
#Install packages not in an apt repo
[ "$DE" = "xfce" ] && dpkg -i $DIR/xfce-themes/*
#Copy in xfce4 default settings
[ "$DE" = "xfce" ] && cp -f $DIR/xfce-config/xfce-perchannel-xml/* /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/
[ "$DE" = "xfce" ] && cp -f $DIR/xfce-config/panel/* /etc/xdg/xfce4/panel/
#Copy in lightdm/light greeter settings
[ "$DE" = "xfce" ] && cp -f $DIR/xfce-config/lightdm/* /etc/lightdm/
#Copy in wallpapers
[ "$DE" = "xfce" ] && rm /usr/share/images/desktop-base/default && cp $DIR/wallpapers/* /usr/share/images/desktop-base/
#Add libinput-gestures config and autostart
[ "$DE" = "xfce" ] && cp $DIR/xfce-config/libinput-gestures/libinput-gestures.conf /etc/
[ "$DE" = "xfce" ] && cp $DIR/xfce-config/libinput-gestures/libinput-gestures.desktop /etc/xdg/autostart/
if [ "$DE" = "xfce" ]
then
#Install packages not in an apt repo
dpkg -i $DIR/xfce-themes/*
#Make plank autostart
[ "$DE" = "xfce" ] && cp $DIR/xfce-config/plank/plank.desktop /etc/xdg/autostart/
#Copy in xfce4 default settings
cp -f $DIR/xfce-config/xfce-perchannel-xml/* /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/
cp -f $DIR/xfce-config/panel/* /etc/xdg/xfce4/panel/
#Copy in lightdm/light greeter settings
cp -f $DIR/xfce-config/lightdm/* /etc/lightdm/
#Copy in wallpapers
rm /usr/share/images/desktop-base/default && cp $DIR/wallpapers/* /usr/share/images/desktop-base/
#Install libinput-gestures and xfdashboard "packages"
cd $DIR/packages/
dtrx libinput-gestures.tar.gz
cd libinput-gestures
make install
cd ..
dtrx xfdashboard-prawnOS.tar.gz
cd xfdashboard-master
make install
cd ..
#Add libinput-gestures config and autostart
cp $DIR/xfce-config/libinput-gestures/libinput-gestures.conf /etc/
cp $DIR/xfce-config/libinput-gestures/libinput-gestures.desktop /etc/xdg/autostart/
#Make plank autostart
cp $DIR/xfce-config/plank/plank.desktop /etc/xdg/autostart/
fi
#Copy in acpi, pulse audio, trackpad settings, funtion key settings

View File

@ -92,25 +92,15 @@ chroot $outmnt apt-get autoremove --purge
chroot $outmnt apt-get clean
#Download the packages to be installed by Install.sh:
chroot $outmnt apt-get install -y -d xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils lxqt xserver-xorg-input-synaptics crda xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies mousepad vlc libutempter0 xterm numix-gtk-theme dconf-tools plank network-manager-gnome network-manager-openvpn
chroot $outmnt apt-get install -y -d xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils lxqt xserver-xorg-input-synaptics crda xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies mousepad vlc libutempter0 xterm numix-gtk-theme dconf-tools plank network-manager-gnome network-manager-openvpn dtrx
#Download and build libinput-gestures
chroot $outmnt apt install libinput-tools xdotool
chroot $outmnt cd /root/
chroot $outmnt git clone http://github.com/bulletmark/libinput-gestures
chroot $outmnt cd libinput-gestures
chroot $outmnt make install
#Download support for libinput-gestures
chroot $outmnt apt install -y libinput-tools xdotool build-essential
#Package is copied into /InstallResources/packages
#Download and build xfdesktop
#chroot $outmnt apt-get install xfce4-dev-tools build-essential glib2.0 libglib2.0-dev xorg-dev libwnck-3-dev libclutter-1.0-dev libgarcon-1-0-dev libxfconf-0-dev libxfce4util-dev libxfce4ui-2-dev libxcomposite-dev libxdamage-dev libxinerama-dev
#chroot $outmnt cd /root/
#chroot $outmnt git clone https://github.com/gmc-holle/xfdashboard
#chroot $outmnt cd xfdashboard
#chroot $outmnt git checkout a7851d82ec89b3cd49952c6022813bbe6b8b0bc9
#One of these three
#chroot $outmnt ./autogen.sh --disable-xcomposite --disable-xdamage --disable-xinerama
#chroot $outmnt ./autogen.sh --disable-xcomposite
#chroot $outmnt ./autogen.sh --disable-xinerama
#Download support for xfdashboard
chroot $outmnt apt-get install -y xfce4-dev-tools build-essential glib2.0 libglib2.0-dev xorg-dev libwnck-3-dev libclutter-1.0-dev libgarcon-1-0-dev libxfconf-0-dev libxfce4util-dev libxfce4ui-2-dev libxcomposite-dev libxdamage-dev libxinerama-dev
#Package is copied into /InstallResources/packages
#Cleanup hosts
rm -rf $outmnt/etc/hosts #This is what https://wiki.debian.org/EmDebian/CrossDebootstrap suggests