1.9 draft

Feat: - General code improvements Removed: - Garuda Linux checker Fix: - Added a license header Planned additions: - Check if Chaotic-AUR is installed/uninstalled - Better Artix Linux compat (?)
RaptaG · Aug 6, 2022 · a969d57 · a969d57 · RaptaG · Aug 6, 2022
1 parent f935d42
commit a969d57
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 97 deletions.
diff --git a/CAAIS b/CAAIS
@@ -2,18 +2,19 @@
 # Made by RaptaG, terminalmaid and TruncatedDinosour
 
 # Definitions
-ver="1.8"
+ver="1.9-dev"
 fname="$(basename $0)"
 GHrelease="https://github.com/RaptaG/CAAIS/releases/tag/$ver"
 isArchBased="$(grep 'ID_LIKE=arch' /etc/os-release)"
-isGaruda="$(grep 'ID=garuda' /etc/os-release)"
 
-# Check if the OS is based on Arch Linux or if it's Garuda Linux
+startup() {
+     echo "CAAIS, version $ver"
+     echo "Current operation: $action Chaotic-AUR"
+}
+
+# Check if the OS is based on Arch Linux (Artix Linux currently broken)
 if [ "$isArchBased" == "" ]; then
-     echo -e "Error: Your system is not (based) on Arch Linux. Chaotic-AUR cannot be installed.\nExiting..."
-     exit 1
-elif [ "$isGaruda" == "ID=garuda" ]; then
-     echo -e "You are running Garuda Linux. Chaotic-AUR is preinstalled in your system and makes CAAIS useless for you.\nExiting..."
+     echo "Error: Your system is not (based on) Arch Linux. Chaotic-AUR cannot be installed."
      exit 1
 fi
 
@@ -24,13 +25,9 @@ if [ "$EUID" -ne 0 ]; then
 fi
 
 # Download & install Chaotic-AUR
-caais-get() {
-     # Startup message
-     echo "CAAIS, version $ver"
-     echo "Current operation: Install Chaotic-AUR"
-
-     # Warning
-     echo -n "Do you wish to proceed [Y/n] " >&2
+install() {
+     startup
+     echo -n "Do you wish to proceed [Y/n] "
      read answer
 
      if [ "$answer" == "n" ]; then
@@ -45,14 +42,14 @@ caais-get() {
      pacman-key --recv-key FBA220DFC880C036 --keyserver keyserver.ubuntu.com > /dev/null 2>&1
      pacman-key --lsign-key FBA220DFC880C036 > /dev/null 2>&1
 
-     # Download its keyring and mirrorlist
-     echo "Downloading its keyring..."
+     # Download Chaotic-AUR's keyring and mirrorlist
+     echo "Downloading the keyring..."
      pacman -U 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst' --noconfirm > /dev/null 2>&1
 
-     echo "Downloading its mirrorlist..."
+     echo "Downloading the mirrorlist..."
      pacman -U 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst' --noconfirm > /dev/null 2>&1
 
-     # Check if it's already appended in pacman.conf, if not skip
+     # Append in pacman.conf
      appendInPacmanConf=$(grep 'chaotic-aur' /etc/pacman.conf)
 
      if [ "$appendInPacmanConf" == "[chaotic-aur]" ]; then
@@ -62,23 +59,19 @@ caais-get() {
           echo -e "\r\n[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist" >> /etc/pacman.conf
      fi
 
-     # Refresh the mirrorlists so that it can be activated
+     # Refresh the mirrorlists
      echo "Refreshing the mirrorlists..."
-     pacman -Sy
+     pacman -Sy > /dev/null 2>&1
 
-     # Finish message
+     # Finish
      echo "Done! Now Chaotic-AUR should be installed and working in your system!"
      exit 0
 }
 
 # Uninstall Chaotic-AUR
-caais-remove() {
-     # Startup message
-     echo "CAAIS, version $ver"
-     echo "Current operation: Uninstall Chaotic-AUR"
-
-     # Warning message
-     echo -n "This will break ALL the packages you may have installed with Chaotic-AUR. Do you wish to proceed? [y/N] " >&2
+remove() {     
+     startup
+     echo -n "This will break ALL the packages you may have installed with Chaotic-AUR. Do you wish to proceed? [y/N] "
      read answer
 
      if [ "$answer" == "n" ]; then
@@ -94,11 +87,10 @@ caais-remove() {
      echo "Deleting the Chaotic-AUR key..."
      pacman-key --delete 3FFA0B5E092ED4095E26F69B8ADB4AEC585061CF > /dev/null 2>&1
 
-     # Uninstall its keyring
-     echo "Uninstalling its keyring..."
+     # Uninstall the keyring and the mirrorlist
+     echo "Uninstalling the keyring..."
      pacman -Rns chaotic-keyring --no-confirm > /dev/null 2>&1
 
-     # Uninstall its mirrorlist
      echo "Uninstalling the mirrorlist..."
      pacman -Rns chaotic-mirrorlist --no-confirm > /dev/null 2>&1
 
@@ -109,72 +101,41 @@ caais-remove() {
 
      # Refresh the mirrorlists
      echo "Refreshing the mirrorlists..."
-     pacman -Sy
+     pacman -Sy > /dev/null 2>&1
 
-     # Finish message
+     # Finish
      echo "Done! Now Chaotic-AUR should be removed from your system."
      exit 0
 }
 
-# Select if you want to delete CAAIS
-delete-caais() {
-     # Startup message
-     echo "CAAIS, version $ver"
-     echo "Current operation: Delete CAAIS"
-
-     echo -n "Warning: This will remove CAAIS completely from your system. Are you sure you want to proceed [Y/n] "
-     read answer
-
-     case "$answer" in
-     [yY] | "")
-          echo "Deleting..."
-          rm $fname
-          exit 0
-          ;;
-     *)
-          exit 0
-          ;;
-     esac
-     unset answer
-}
-
 # Find the option selected and run the correct command
 case "$1" in
 -h | --help)
      echo -e "Usage: $fname [OPTION]"
      echo -e "\n-h, --help                   This help menu"
-     echo -e "\n-v, --version                Display the version of CAAIS currently used"
-     echo -e "\n-c, --contributors           Display the current contributors of CAAIS"
-     echo -e "\n-d, --delete                 Delete CAAIS (NOT Chaotic-AUR)"
+     echo -e "\n-a, --about                  Display informaton about CAAIS (eg. version)"
      echo -e "\n-i, --install                Download and install Chaotic-AUR"
      echo -e "\n-r, --remove                 Remove Chaotic-AUR from your system"
      echo -e "\nThe main repo with the source code, the license and all the info related is availiable here:\nhttps://github.com/RaptaG/CAAIS"
      ;;
--v | --version)
+-a | --about)
      echo "Version of CAAIS currently used: $ver"
-     echo "GitHub release: $GHrelease"
-     ;;
--c | --contributors)
+     echo -e "GitHub release: $GHrelease\n"
      echo "Current contributors:"
      echo "1) RaptaG (main developer)"
      echo "2) terminalmaid (Pull Request #1)"
      echo "3) TruncatedDinosour (Pull Request #2)"
      ;;
--d | --delete)
-     delete-caais "$@"
-     ;;
 -i | --install)
-     caais-get "$@"
+     action="Install"
+     install
      ;;
 -r | --remove)
-     caais-remove "$@"
-     ;;
-"")
-     echo "Invalid selection. Please run 'sudo ./$fname' to see the list of all the options availiable."
-     exit 1
+     action="Remove"
+     remove
      ;;
 *)
-     echo "Invalid option '$1'. Please run 'sudo ./$fname --help' for more information."
+     echo "Invalid selection. Please run 'sudo ./$fname' to see the list of all the options availiable."
      exit 1
      ;;
 esac
diff --git a/LICENSE b/LICENSE
@@ -174,28 +174,3 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2022 RaptaG
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/LICENSE_HEADER b/LICENSE_HEADER
@@ -0,0 +1,13 @@
+Copyright 2022 RaptaG
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.