X-Git-Url: https://code.delx.au/refind/blobdiff_plain/feac8e01e8dd381f6d3713cee73c8865561c96d5..0a23a9a7b0c88de8c1f67a249a49a9d019baafe9:/install.sh diff --git a/install.sh b/install.sh index f5dae71..dcfec93 100755 --- a/install.sh +++ b/install.sh @@ -135,16 +135,18 @@ GetParams() { esac shift done - + if [[ "$InstallToEspOnMac" == 0 && "$RootDir" == '/' && "$TargetDir" == '/EFI/BOOT' ]] ; then + echo "You may use --notesp OR --usedefault, but not both! Aborting!" + exit 1 + fi if [[ "$RootDir" != '/' && "$TargetDir" == '/EFI/BOOT' ]] ; then - echo "You may use --usedefault OR --root, but not both! Aborting!" + echo "You may use --root OR --usedefault, but not both! Aborting!" exit 1 fi if [[ "$TargetDir" != '/System/Library/CoreServices' && "$OwnHfs" == '1' ]] ; then echo "If you use --ownhfs, you may NOT use --usedefault! Aborting!" exit 1 fi - RLConfFile="$RootDir/boot/refind_linux.conf" EtcKeysDir="$RootDir/etc/refind.d/keys" } # GetParams() @@ -1049,7 +1051,6 @@ InstallOnLinux() { # performs a few startup checks, and then calls functions to # install under OS X or Linux, depending on the detected platform. # - OSName=`uname -s` GetParams "$@" ThisDir="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"