Skip to content

Commit

Permalink
use _tools instead of tools (avoids conflicts with tools use in old g…
Browse files Browse the repository at this point in the history
…ithub revisions)
  • Loading branch information
RehabMan committed Oct 3, 2018
1 parent 31a0c0c commit e6f24ce
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .gitignore
@@ -1,6 +1,6 @@
.DS_Store
_downloads/
tools/
_tools/
Patches.xcodeproj/xcuserdata
Patches.xcodeproj/project.xcworkspace
Build/*.aml
Expand Down
16 changes: 16 additions & 0 deletions _get_tools.sh
@@ -0,0 +1,16 @@
#!/bin/bash
#set -x

# get copy of tools if not present
if [[ ! -d ./_tools ]]; then
git clone https://github.com/RehabMan/hack-tools.git _tools
fi
# update tools to latest
if [[ -e ./_tools/.git ]]; then
cd ./_tools && git pull
cd ..
fi
# remove old tools copy (that was in tools instead of _tools)
rm -Rf tools

#eof
14 changes: 3 additions & 11 deletions download.sh
@@ -1,19 +1,11 @@
#!/bin/bash
#set -x

# get copy of tools if not present
if [[ ! -d ./tools ]]; then
git clone https://github.com/RehabMan/hack-tools.git tools
fi
# update tools to latest
if [[ -e ./tools/.git ]]; then
cd ./tools && git pull
cd ..
fi
# get copy of tools
"$(dirname ${BASH_SOURCE[0]})"/_get_tools.sh

# include subroutines
DIR=$(dirname ${BASH_SOURCE[0]})
source "$DIR/tools/_download_subs.sh"
source "$(dirname ${BASH_SOURCE[0]})"/_tools/_download_subs.sh

# remove deprecated downloads directory to avoid confusion
if [[ -e ./downloads ]]; then rm -Rf ./downloads; fi
Expand Down
3 changes: 1 addition & 2 deletions install_downloads.sh
Expand Up @@ -8,8 +8,7 @@ ESSENTIAL=
#HDA=ALC283

# include subroutines
DIR=$(dirname ${BASH_SOURCE[0]})
source "$DIR/tools/_install_subs.sh"
source "$(dirname ${BASH_SOURCE[0]})"/_tools/_install_subs.sh

warn_about_superuser

Expand Down
1 change: 1 addition & 0 deletions mount_efi.sh

0 comments on commit e6f24ce

Please sign in to comment.