Skip to content

Commit

Permalink
Removed requirement for bash 5.0
Browse files Browse the repository at this point in the history
Also updated Copyright and added Catalina and Big Sur support
  • Loading branch information
Rybo713 committed Mar 21, 2021
1 parent 845b137 commit d4c29ad
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 42 deletions.
10 changes: 5 additions & 5 deletions Hakku2.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
19 changes: 8 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.

<img src="https://i.imgur.com/SUDUa2r.png" alt="HackTool" align="left" height="520px">

Expand All @@ -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

Expand All @@ -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
23 changes: 10 additions & 13 deletions functions.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -317,6 +313,7 @@ goodbye(){
read -p "> " in

if [ $in = "y" ] || [ $in = "Y" ]; then
clear
exit 0
elif [ $in = "n" ] || [ $in = "N" ]; then
mainmenu
Expand Down
2 changes: 1 addition & 1 deletion perm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion settings.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions settings_f.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tweaks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions tweaks_f.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions update_f.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit d4c29ad

Please sign in to comment.