From 3046b944b3837f59075adde545a0db9b051d739b Mon Sep 17 00:00:00 2001
From: Jack Reez <null>
Date: Thu, 31 Jan 2019 20:58:20 +0530
Subject: [PATCH] Fixed fresh install bug

Bug:

If there is no 'themes' directory inside '/boot/grub/' then the
Install script copies the contents of 'Vimix' directory to the root of
'/boot/grub/themes' directory.

Changes:

Create 'themes' directory if not exists.

Copied the 'has_command' function from the install script of Vimix to
the install script of Stylish Dark.

Also made some documentation changes and decorations :)
---
 grub-theme-stylishdark/Install | 40 +++++++++++++++++++++++++++-------
 grub-theme-vimix/Install       | 27 ++++++++++++++++++-----
 2 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/grub-theme-stylishdark/Install b/grub-theme-stylishdark/Install
index f0f9c28..763def0 100755
--- a/grub-theme-stylishdark/Install
+++ b/grub-theme-stylishdark/Install
@@ -1,23 +1,47 @@
 #!/bin/bash
 
+# StylishDark - Grub2 Dark Theme
+
 ROOT_UID=0
 
+# Welcome message
+echo -e "\n\t************************************\n\t*  StylishDark - Grub2 Dark Theme  *\n\t************************************"
+
+# Check command avalibility
+function has_command() {
+    command -v $1 > /dev/null
+}
+
+echo -e "\nChecking for root access..."
+
+# Checking for root access and proceed if it is present
 if [ "$UID" -eq "$ROOT_UID" ]; then
 
+  # Create themes directory if not exists
+  echo -e "Checking for the existence of themes directory..."
+  mkdir -p /boot/grub/themes
+
   # Copy StylishDark
+  echo -e "Installing Vimix theme..."
   cp -a StylishDark /boot/grub/themes
 
   # Set StylishDark
+  echo -e "Setting Vimix as default..."
   grep "GRUB_THEME=" /etc/default/grub 2>&1 >/dev/null && sed -i '/GRUB_THEME=/d' /etc/default/grub
   echo "GRUB_THEME=\"/boot/grub/themes/StylishDark/theme.txt\"" >> /etc/default/grub
 
-  # update grub
-  grub-mkconfig -o /boot/grub/grub.cfg
-
-  echo -e "\n All done!"
-
-else
-  echo -e "\n Please run this script by root..."
-fi
+  # Update grub config
+  echo -e "Updating grub config..."
+  if has_command update-grub; then
+    update-grub
+  elif has_command grub-mkconfig; then
+    grub-mkconfig -o /boot/grub/grub.cfg
+  fi
 
+  # Success message
+  echo -e "\n\t       ***************\n\t       *  All done!  *\n\t       ***************\n"
 
+  else
+    # Error message
+    echo -e "\n\t   ******************************\n\t   *  Error! -> Run me as root  *\n\t   ******************************\n"
+  fi
diff --git a/grub-theme-vimix/Install b/grub-theme-vimix/Install
index c95b0b5..54005c0 100755
--- a/grub-theme-vimix/Install
+++ b/grub-theme-vimix/Install
@@ -1,32 +1,47 @@
 #!/bin/bash
 
+# Vimix - Grub2 Flat Theme
+
 ROOT_UID=0
 
-# check command avalibility
+# Welcome message
+echo -e "\n\t******************************\n\t*  Vimix - Grub2 Flat Theme  *\n\t******************************"
+
+# Check command avalibility
 function has_command() {
     command -v $1 > /dev/null
 }
 
+echo -e "\nChecking for root access..."
+
+# Checking for root access and proceed if it is present
 if [ "$UID" -eq "$ROOT_UID" ]; then
 
+  # Create themes directory if not exists
+  echo -e "Checking for the existence of themes directory..."
+  mkdir -p /boot/grub/themes
+
   # Copy Vimix
+  echo -e "Installing Vimix theme..."
   cp -a Vimix /boot/grub/themes
 
   # Set Vimix
+  echo -e "Setting Vimix as default..."
   grep "GRUB_THEME=" /etc/default/grub 2>&1 >/dev/null && sed -i '/GRUB_THEME=/d' /etc/default/grub
   echo "GRUB_THEME=\"/boot/grub/themes/Vimix/theme.txt\"" >> /etc/default/grub
 
-  # update grub
+  # Update grub config
+  echo -e "Updating grub config..."
   if has_command update-grub; then
     update-grub
   elif has_command grub-mkconfig; then
     grub-mkconfig -o /boot/grub/grub.cfg
   fi
 
-  echo -e "\n All done!"
+  # Success message
+  echo -e "\n\t       ***************\n\t       *  All done!  *\n\t       ***************\n"
 
 else
-  echo -e "\n Please run this script by root..."
+  # Error message
+  echo -e "\n\t******************************\n\t*  Error! -> Run me as root  *\n\t******************************\n"
 fi
-
-