bpmcdevitt/exploit-db-mirror
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tweak update system for git & brew

Browse source
This commit is contained in:
g0tmi1k 2017-09-04 18:33:19 +01:00
parent f94c5966a1
commit 2644d23e07
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
searchsploit
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Name: SearchSploit - Exploit-DB's CLI search tool # Name: SearchSploit - Exploit-DB's CLI search tool
# Version: 3.8.3 (Release date: 2017-08-29) # Version: 3.8.4 (Release date: 2017-09-04)
# Written by: Offensive Security, Unix-Ninja, and g0tmi1k # Written by: Offensive Security, Unix-Ninja, and g0tmi1k
# Homepage: https://github.com/offensive-security/exploit-database # Homepage: https://github.com/offensive-security/exploit-database
# Manual: https://www.exploit-db.com/searchsploit/ # Manual: https://www.exploit-db.com/searchsploit/
@ -119,9 +119,9 @@ function update()
fi fi
# Update from homebrew (e.g. OSX) # Update from homebrew (e.g. OSX)
brew install exploitdb 2>/dev/null >/dev/null brew 2>/dev/null >/dev/null
if [[ "$?" == "0" ]]; then if [[ "$?" == "0" ]]; then
# This only really updates searchsploit # This only really updates ./searchsploit
updatedbrew updatedbrew
fi fi
@ -153,7 +153,7 @@ function updatedbrew()
brew update \ brew update \
|| echo -e '\n[-] Issue with brew update (Please check network connectivity).' 1>&2 || echo -e '\n[-] Issue with brew update (Please check network connectivity).' 1>&2
brew upgrade exploitdb 2>/dev/null >/dev/null brew upgrade exploitdb
echo -e "\n[*] Brew update finished." echo -e "\n[*] Brew update finished."
} }
@ -181,19 +181,19 @@ function updategit()
if [[ "$( git remote -v )" != *"${gitremote}"* ]]; then if [[ "$( git remote -v )" != *"${gitremote}"* ]]; then
echo -e '\n[i] Missing Git remote:' "${gitremote}" echo -e '\n[i] Missing Git remote:' "${gitremote}"
git init >/dev/null git init >/dev/null
git remote add origin "${gitremote}" 2>/dev/null git remote add upstream "${gitremote}" 2>/dev/null
fi fi
# Make sure to prep checkout first # Make sure to prep checkout first
git checkout -- . git checkout -- .
# Update from git # Update from git
git pull origin master git pull upstream master
# If conflicts, clean and try again # If conflicts, clean and try again
if [[ "$?" -ne 0 ]]; then if [[ "$?" -ne 0 ]]; then
git clean -d -fx "" git clean -d -fx ""
git pull origin master git pull upstream master
fi fi
echo -e "\n[*] Git update finished." echo -e "\n[*] Git update finished."