diff --git a/Hakku2.sh b/Hakku2.sh index 58dfa2b..7a9a031 100755 --- a/Hakku2.sh +++ b/Hakku2.sh @@ -1,12 +1,12 @@ -#!/usr/local/bin/bash +#!/bin/bash # # Hakku2: A totally reworked command line utility which shows the user # their system info and a bunch of useful tools and tweaks. -# Built using Bash version 5.0.7(1)-release +# Built using Bash version 3.2.57(1)-release # # The MIT License (MIT) # -# Copyright (c) 2019 Ryan Wong +# Copyright (c) 2021 Ryan Wong # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -37,8 +37,8 @@ LYELLOW='\033[1;33m' bold=$(tput bold) normal=$(tput sgr0) -version="v2.2.0beta" -build="build-20190519" +version="v2.3.0beta" +build="build-20210321" updating="Please check for updates." color="${YELLOW}${bold}" diff --git a/LICENSE b/LICENSE index 06ae36d..cf0f83b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019 Ryan Wong +Copyright (c) 2021 Ryan Wong Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index d5a70e4..f8b10be 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Hakku -A command-line utility which shows the user their system info and a bunch of useful tools and tweaks. +A command-line utility which shows the user their system info and a bunch of useful tools and tweaks for macOS. HackTool @@ -9,7 +9,6 @@ A command-line utility which shows the user their system info and a bunch of use - jq - wget - curl - - bash 5.0 ## Instructions for Hakku v1.0-1.9beta @@ -25,15 +24,13 @@ A command-line utility which shows the user their system info and a bunch of use 8) From now on you can update to new releases using the script ## Instructions for Hakku2 v2.0-alpha1 and above - 0) Make sure you have the latest bash 5.0 installed and made it the default shell. - - If not, follow this guide: https://itnext.io/upgrading-bash-on-macos-7138bd1066ba - 1) Go to Releases and download the latest version. - 2) Extract zip file - 3) Open terminal and type `cd "location of extracted folder"` - 4) In terminal type `sudo chmod +x ./perm.sh` - 5) Then type `sudo ./perm.sh` - 6) After that type `sudo ./Hakku2.sh` - 7) From now on you can update to new releases using the script + 0) Go to Releases and download the latest version. + 1) Extract zip file + 2) Open terminal and type `cd "location of extracted folder"` + 3) In terminal type `sudo chmod +x ./perm.sh` + 4) Then type `sudo ./perm.sh` + 5) After that type `sudo ./Hakku2.sh` + 6) From now on you can update to new releases using the script ## Credits Ryan Wong diff --git a/functions.sh b/functions.sh index 10b6495..76dfe73 100755 --- a/functions.sh +++ b/functions.sh @@ -1,12 +1,12 @@ -#!usr/local/bin/bash +#!bin/bash # # Hakku2 Functions: A totally reworked command line utility which shows the user # their system info and a bunch of useful tools and tweaks. -# Built using Bash version 5.0.7(1)-release +# Built using Bash version 3.2.57(1)-release # # The MIT License (MIT) # -# Copyright (c) 2019 Ryan Wong +# Copyright (c) 2021 Ryan Wong # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -52,16 +52,6 @@ else exit 0 fi -if -command -v bash > /dev/null ; then - printf "${GREEN}${bold}[INFO] ${NC}${normal}bash 5.0 is installed\n" -else - printf "${RED}${bold}[ERROR] ${NC}${normal}bash 5.0 is not installed\n" - echo "Install bash 5.0 with 'brew install bash'" - echo "Follow the instructions on Github to link it" - exit 0 -fi - if command -v jq > /dev/null ; then printf "${GREEN}${bold}[INFO] ${NC}${normal}jq is installed\n" else @@ -141,6 +131,12 @@ elif [ $OS == "10.13.0" ] || [ $OS == "10.13.1" ] || [ $OS == "10.13.2" ] || [ $ name="(High Sierra)" elif [ $OS == "10.12.0" ] || [ $OS == "10.12.1" ] || [ $OS == "10.12.2" ] || [ $OS == "10.12.3" ] || [ $OS == "10.12.4" ] || [ $OS == "10.12.5" ] || [ $OS == "10.12.6" ]; then name="(Sierra)" +elif [ $OS == "10.15" ] || [ $OS == "10.15.1" ] || [ $OS == "10.15.2" ] || [ $OS == "10.15.3" ] || [ $OS == "10.15.4" ] || [ $OS == "10.15.5" ] || [ $OS == "10.15.6" ] || [ $OS == "10.15.7"]; then + name="(Catalina)" +elif [ $OS == "11.0" ] || [ $OS == "11.0.1" ] || [ $OS == "11.1" ] || [ $OS == "11.2" ] || [ $OS == "11.2.1" ] || [ $OS == "11.2.2" ] || [ $OS == "11.2.3" ]; then + name="(Big Sur)" +elif [ $OS == "11.3" ]; then + name="(Big Sur Beta)" else name="(Unknown)" fi @@ -317,6 +313,7 @@ goodbye(){ read -p "> " in if [ $in = "y" ] || [ $in = "Y" ]; then + clear exit 0 elif [ $in = "n" ] || [ $in = "N" ]; then mainmenu diff --git a/perm.sh b/perm.sh index a54c6f1..01fcb76 100755 --- a/perm.sh +++ b/perm.sh @@ -4,7 +4,7 @@ # # The MIT License (MIT) # -# Copyright (c) 2019 Ryan Wong +# Copyright (c) 2021 Ryan Wong # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/settings.sh b/settings.sh index ef12271..92ba28f 100755 --- a/settings.sh +++ b/settings.sh @@ -5,7 +5,7 @@ # # The MIT License (MIT) # -# Copyright (c) 2019 Ryan Wong +# Copyright (c) 2021 Ryan Wong # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/settings_f.sh b/settings_f.sh index 56d7ddd..94e1236 100755 --- a/settings_f.sh +++ b/settings_f.sh @@ -1,13 +1,13 @@ -#!/usr/local/bin/bash +#!/bin/bash # # Hakku2 Settings Functions: A totally reworked command line utility which shows # the user their system info and a bunch of useful # tools and tweaks. -# Built using Bash version 5.0.7(1)-release +# Built using Bash version 3.2.57(1)-release # # The MIT License (MIT) # -# Copyright (c) 2019 Ryan Wong +# Copyright (c) 2021 Ryan Wong # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/tweaks.sh b/tweaks.sh index 94b3eec..8450bad 100755 --- a/tweaks.sh +++ b/tweaks.sh @@ -6,7 +6,7 @@ # # The MIT License (MIT) # -# Copyright (c) 2019 Ryan Wong +# Copyright (c) 2021 Ryan Wong # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/tweaks_f.sh b/tweaks_f.sh index b5f3906..d41a027 100755 --- a/tweaks_f.sh +++ b/tweaks_f.sh @@ -1,13 +1,13 @@ -#!/usr/local/bin/bash +#!/bin/bash # # Hakku2 Tweaks Functions: A totally reworked command line utility which shows # the user their system info and a bunch of useful # tools and tweaks. -# Built using Bash version 5.0.7(1)-release +# Built using Bash version 3.2.57(1)-release # # The MIT License (MIT) # -# Copyright (c) 2019 Ryan Wong +# Copyright (c) 2021 Ryan Wong # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/update_f.sh b/update_f.sh index d1e2aa0..d517752 100755 --- a/update_f.sh +++ b/update_f.sh @@ -1,13 +1,13 @@ -#!/usr/local/bin/bash +#!/bin/bash # # Hakku2 Update Functions: A totally reworked command line utility which shows # the user their system info and a bunch of useful # tools and tweaks. -# Built using Bash version 5.0.7(1)-release +# Built using Bash version 3.2.57(1)-release # # The MIT License (MIT) # -# Copyright (c) 2019 Ryan Wong +# Copyright (c) 2021 Ryan Wong # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal