re-arrange theme related things in gentoox_build.sh

2 files changed, 19 insertions, 15 deletions

diff --git a/gentoox_build.sh b/gentoox_build.sh
index 7fb2afe..8378b5d 100755
--- a/gentoox_build.sh
+++ b/gentoox_build.sh
@@ -416,16 +416,6 @@ source /etc/profile  && export PS1="(chroot) \$PS1"
 eselect profile set "default/linux/amd64/17.1/desktop/plasma"
 sed -i -r "s/^USE=\"([^\"]*)\"$/USE=\"\1 -webkit\"/g" /etc/portage/make.conf
 
-# theme related
-(cd /usr/share/icons; git clone https://github.com/keeferrourke/la-capitaine-icon-theme.git)
-cd /usr/src/
-git clone https://github.com/ishovkun/SierraBreeze.git
-cd SierraBreeze/
-mkdir build && cd build
-cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DKDE_INSTALL_LIBDIR=lib -DBUILD_TESTING=OFF -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
-make install
-cd /
-
 echo -e '\nkde-apps/kdecore-meta -webengine
 kde-plasma/kde-cli-tools kdesu
 kde-apps/akonadi -mysql sqlite
@@ -438,7 +428,7 @@ kde-plasma/plasma-desktop emoji
 kde-plasma/plasma-meta colord grub qrcode
 kde-plasma/plasma-vault networkmanager
 media-video/vlc archive bluray dav1d libass libcaca lirc live opus samba speex skins theora vaapi v4l vdpau x265
-media-video/ffmpeg bluray cdio dav1d rubberband libass ogg vpx rtmp aac wavpack opus gme v4l webp theora xcb cpudetection x265 libaom truetype libsoxr modplug samba vaapi vdpau libcaca libdrm librtmp opencl openssl speex
+media-video/ffmpeg bluray cdio dav1d rubberband libass ogg vpx rtmp aac wavpack opus gme v4l webp theora xcb cpudetection x265 libaom truetype libsoxr modplug samba vaapi vdpau libcaca libdrm librtmp opencl openssl speex jpeg2k
 dev-qt/qtmultimedia gstreamer
 media-libs/gd avif heif
 gnome-base/gvfs afp archive bluray fuse gphoto2 ios mtp nfs samba zeroconf
@@ -459,6 +449,15 @@ latte-dock plasma-sdk libdbusmenu gvfs kuroo
 #yes | layman -o https://raw.githubusercontent.com/fosero/flatpak-overlay/master/repositories.xml -f -a flatpak-overlay -q
 emerge -v sys-apps/flatpak
 
+# theme related
+(cd /usr/share/icons; git clone https://github.com/keeferrourke/la-capitaine-icon-theme.git)
+cd /usr/src/
+git clone https://github.com/ishovkun/SierraBreeze.git
+cd SierraBreeze/
+mkdir build && cd build
+cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DKDE_INSTALL_LIBDIR=lib -DBUILD_TESTING=OFF -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+make install
+
 touch /tmp/gentoox-kde-done
 HEREDOC
 exit 0
@@ -683,6 +682,11 @@ x11-libs/xcb-util-cursor abi_x86_32
 x11-libs/xcb-util-image abi_x86_32
 x11-libs/xcb-util-renderutil abi_x86_32
 dev-libs/libusb-compat abi_x86_32
+media-libs/speexdsp abi_x86_32
+media-libs/openjpeg abi_x86_32
+app-crypt/libmd abi_x86_32
+dev-libs/libudfread abi_x86_32
+sys-libs/libxcrypt abi_x86_32
 
 app-emulation/wine-vanilla custom-cflags vkd3d' >> /etc/portage/package.use/gentoox
 
diff --git a/install.sh b/install.sh
index e49da3e..1f977f7 100755
--- a/install.sh
+++ b/install.sh
@@ -5,10 +5,10 @@ if [ $(id -u) != "0" ]; then
 fi
 
 set -e
-echo -e 'Welcome to the GentooX setup, the installation script mainly consists of:
+echo -e 'Welcome to the GentooX setup, the installation mainly consists of:
 \t- providing this script with a target partition where system will be installed
 \t- extracting precompiled squashfs system image into the specified partition
-\t- setting up GRUB, BIOS or UEFI mode will be used depending how system was booted
+\t- setting up GRUB. BIOS or UEFI mode will be used depending how system was booted
 \tGentooX uses openSUSE-style BTRFS root partition & subvolumes for snapshotting with snapper
 \tGentooX requires minimum of 16GB of space, and use of BTRFS is hardcoded
 
@@ -17,7 +17,7 @@ Manual installation can be done via:
   unsquashfs -f -i -d /mnt/install/ /mnt/cdrom/image.squashfs
   /usr/local/sbin/genfstab -U >> /mnt/install/etc/fstab
   /usr/local/sbin/arch-chroot /mnt/install/
-  grub-install --target=x86_64-efi for UEFI mode or grub-install --target=i386-pc (BIOS only)
+  grub-install --target=x86_64-efi for UEFI mode, or grub-install --target=i386-pc (BIOS only)
   grub-mkconfig -o /boot/grub/grub.cfg'
 
 
@@ -94,7 +94,7 @@ setup_btrfs () {
 echo -e "\nDetected drives:\n$(lsblk | grep disk)"
 while :; do
 	echo
-	read -erp "Automatic partitioning (a) or manual partitioning (will launch gparted)? [a/m] " -n 1 partitioning_mode
+	read -erp "Automatic partitioning (a), or manual partitioning ((m), will launch gparted)? [a/m] " -n 1 partitioning_mode
 	if [[ $partitioning_mode = "a" ]]; then
         if [[ ! -z $UEFI_MODE ]]; then echo "EFI boot detected"; fi
 		read -erp "Enter drive to be formatted for GentooX installation: " -i "/dev/sda" drive