From cdd0cb0bad6c7017a2cb7a1952bfc3d223d00983 Mon Sep 17 00:00:00 2001
From: "Eshan Roy (Eshanized)" <src.eshan@gmail.com>
Date: Thu, 7 Mar 2024 16:59:06 +0530
Subject: [PATCH] =?UTF-8?q?@eshanized:=20push=20via=20push.sh=20?=
 =?UTF-8?q?=F0=9F=8E=89=20!!!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 usr/local/bin/snigdhaos-fix-grub                      | 3 +--
 usr/local/bin/snigdhaos-fix-pacman-conf               | 1 -
 usr/local/bin/snigdhaos-fix-pacman-databases-and-keys | 1 -
 usr/local/bin/snigdhaos-fix-pacman-gpg-conf           | 1 -
 usr/local/bin/snigdhaos-get-mirrors                   | 1 -
 usr/local/bin/snigdhaos-lsb-release                   | 1 -
 usr/local/bin/snigdhaos-os-release                    | 1 -
 usr/local/bin/snigdhaos-systemd-test                  | 3 +--
 usr/local/bin/snigdhaos-toboot                        | 1 -
 usr/local/bin/snigdhaos-togrub                        | 3 ++-
 10 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/usr/local/bin/snigdhaos-fix-grub b/usr/local/bin/snigdhaos-fix-grub
index ef92729..7dcbddb 100644
--- a/usr/local/bin/snigdhaos-fix-grub
+++ b/usr/local/bin/snigdhaos-fix-grub
@@ -1,6 +1,4 @@
 #!/bin/bash
-#set -e
-# shellcheck disable=SC2154
 
 echo
 echo "Reinstalling Grub..."
@@ -41,6 +39,7 @@ check_file
 
 if [ $Online -eq 1 ] ; then
 	echo "Downloading Default Grub..."
+	# shellcheck disable=SC2154
 	sudo wget https://raw.githubusercontent.com/Snigdha-OS/snigdhaos-updater/master/grub -O "$workdir"/etc/default/grub
 fi
 
diff --git a/usr/local/bin/snigdhaos-fix-pacman-conf b/usr/local/bin/snigdhaos-fix-pacman-conf
index 8d82bf2..327825d 100644
--- a/usr/local/bin/snigdhaos-fix-pacman-conf
+++ b/usr/local/bin/snigdhaos-fix-pacman-conf
@@ -1,5 +1,4 @@
 #!/bin/bash
-#set -e
 
 echo
 echo "Downloading Latest pacman.conf..."
diff --git a/usr/local/bin/snigdhaos-fix-pacman-databases-and-keys b/usr/local/bin/snigdhaos-fix-pacman-databases-and-keys
index 9adabeb..f4e41d6 100644
--- a/usr/local/bin/snigdhaos-fix-pacman-databases-and-keys
+++ b/usr/local/bin/snigdhaos-fix-pacman-databases-and-keys
@@ -1,5 +1,4 @@
 #!/bin/bash
-# set -e
 
 Online=0
 function check_connectivity() {
diff --git a/usr/local/bin/snigdhaos-fix-pacman-gpg-conf b/usr/local/bin/snigdhaos-fix-pacman-gpg-conf
index b1e073b..7f02116 100644
--- a/usr/local/bin/snigdhaos-fix-pacman-gpg-conf
+++ b/usr/local/bin/snigdhaos-fix-pacman-gpg-conf
@@ -1,5 +1,4 @@
 #!/bin/bash
-#set -e
 
 echo
 echo "Copying /etc/pacman.d/gnupg/gpg.conf"
diff --git a/usr/local/bin/snigdhaos-get-mirrors b/usr/local/bin/snigdhaos-get-mirrors
index aca3636..bb7aed9 100644
--- a/usr/local/bin/snigdhaos-get-mirrors
+++ b/usr/local/bin/snigdhaos-get-mirrors
@@ -1,5 +1,4 @@
 #!/bin/bash
-#set -e
 
 sudo /usr/bin/reflector --score 100 --fastest 10 --number 10 --verbose --save /etc/pacman.d/mirrorlist
 
diff --git a/usr/local/bin/snigdhaos-lsb-release b/usr/local/bin/snigdhaos-lsb-release
index e0e3d4c..1aa3e41 100644
--- a/usr/local/bin/snigdhaos-lsb-release
+++ b/usr/local/bin/snigdhaos-lsb-release
@@ -1,5 +1,4 @@
 #!/bin/bash
-#set -e
 
 echo
 echo "Applying lsb Release..."
diff --git a/usr/local/bin/snigdhaos-os-release b/usr/local/bin/snigdhaos-os-release
index 1f868c6..4381f8b 100644
--- a/usr/local/bin/snigdhaos-os-release
+++ b/usr/local/bin/snigdhaos-os-release
@@ -1,5 +1,4 @@
 #!/bin/bash
-#set -e
 
 echo
 echo "Applying OS Release..."
diff --git a/usr/local/bin/snigdhaos-systemd-test b/usr/local/bin/snigdhaos-systemd-test
index 7cdc136..7a462f5 100644
--- a/usr/local/bin/snigdhaos-systemd-test
+++ b/usr/local/bin/snigdhaos-systemd-test
@@ -1,10 +1,9 @@
 #!/bin/bash
 
-#set -e
-
 boot=$(bootctl status | grep Product | awk '{printf($2)}')
 echo "The system is using $boot to boot."
 
+# shellcheck disable=SC2086
 if [ $boot = "GRUB" ]; then
 	/usr/bin/grub-install --target=x86_64-efi --efi-directory=/boot/efi --bootloader-id=snigdhaos --disable-shim-lock --removable
 fi
diff --git a/usr/local/bin/snigdhaos-toboot b/usr/local/bin/snigdhaos-toboot
index 31b2e30..ade4313 100644
--- a/usr/local/bin/snigdhaos-toboot
+++ b/usr/local/bin/snigdhaos-toboot
@@ -1,5 +1,4 @@
 #!/bin/bash
-#set -e
 
 if lsblk | grep -q "/boot/efi" ; then
 	echo
diff --git a/usr/local/bin/snigdhaos-togrub b/usr/local/bin/snigdhaos-togrub
index 72d6b07..f167d0d 100644
--- a/usr/local/bin/snigdhaos-togrub
+++ b/usr/local/bin/snigdhaos-togrub
@@ -1,5 +1,4 @@
 #!/bin/bash
-#set -e
 
 echo
 echo "Reinstalling Grub..."
@@ -40,6 +39,8 @@ check_file
 
 if [ $Online -eq 1 ] ; then
 	echo "getting latest /etc/default/grub from github"
+	# shellcheck disable=SC2086
+	# shellcheck disable=SC2154
 	sudo wget https://raw.githubusercontent.com/Snigdha-OS/snigdhaos-updater/master/grub -O $workdir/etc/default/grub
 fi