From d27a676a8ac914e0f4d4c19a099735a4b2829018 Mon Sep 17 00:00:00 2001 From: maride Date: Mon, 7 Aug 2017 16:30:30 +0200 Subject: [PATCH] Add flavours i3 and xorg; add choice for flavours; add reboot --- flavours/i3/install.sh | 8 ++++++++ flavours/xorg/install.sh | 3 +++ install.sh | 28 +++++++++++++++++++++------- 3 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 flavours/i3/install.sh create mode 100644 flavours/xorg/install.sh diff --git a/flavours/i3/install.sh b/flavours/i3/install.sh new file mode 100644 index 0000000..dd0af97 --- /dev/null +++ b/flavours/i3/install.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +echo "~> Installing i3" +pacstrap /mnt i3 feh xcompmgr dmenu acpi + +echo "~> Creating .xinitrc" +echo "xcompmgr -c &" > /mnt/home/$username/.xinitrc +echo "exec i3" >> /mnt/home/$username/.xinitrc diff --git a/flavours/xorg/install.sh b/flavours/xorg/install.sh new file mode 100644 index 0000000..d12e4ea --- /dev/null +++ b/flavours/xorg/install.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +pacstrap /mnt xorg xorg-xinit diff --git a/install.sh b/install.sh index 1078121..9d67433 100755 --- a/install.sh +++ b/install.sh @@ -48,12 +48,26 @@ done for flavour in flavours/*.flavour do - echo "=> Running flavour '$flavour'..." - pushd $flavour - $flavour/run.sh - return=$? - if [ "$return" -ne 0 ]; then - echo "=> Flavour failed. :(" + echo -n "=> Do you want to run flavour '$flavour'? (y/N) " + read answer + + if [ "$answer" == "y" ]; then + echo "=> Running flavour '$flavour'..." + pushd $flavour + $flavour/run.sh + return=$? + if [ "$return" -ne 0 ]; then + echo "=> Flavour failed. :(" + fi + popd fi - popd done + +echo -n "=> Finished \o/ reboot now? (Y/n) " +read answer + +if [ "$answer" == "n" ]; then + exit +fi + +reboot