matir/skel
1
0
Fork 0
mirror of https://github.com/Matir/skel.git synced 2026-05-26 13:35:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix conditional.

Browse Source
This commit is contained in:
David Tomaschik
2018-01-30 19:35:44 -08:00
parent 7c5a617897
commit 8f6127d19d
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
install.sh
View File

@@ -100,7 +100,7 @@ install_git() {
add_bin_symlink() { add_bin_symlink() {
local LINKNAME=${HOME}/bin/${2:-`basename $1`} local LINKNAME=${HOME}/bin/${2:-`basename $1`}
if [ -e ${LINKNAME} && ! -h ${LINKNAME} ] ; then if [ -e ${LINKNAME} -a ! -h ${LINKNAME} ] ; then
echo "Refusing to overwrite ${LINKNAME}" >&2 echo "Refusing to overwrite ${LINKNAME}" >&2
return 1 return 1
fi fi
@@ -132,12 +132,6 @@ postinstall() {
# Install other useful tools # Install other useful tools
install_git https://github.com/trustedsec/ptf.git ${HOME}/bin/ptframework && \ install_git https://github.com/trustedsec/ptf.git ${HOME}/bin/ptframework && \
add_bin_symlink ${HOME}/bin/ptframework/ptf add_bin_symlink ${HOME}/bin/ptframework/ptf
# Refresh all gpg keys
if test -x "`which gpg2`" ; then
gpg2 --refresh-keys
else
gpg --refresh-keys
fi
} }
ssh_key_already_installed() { ssh_key_already_installed() {