mirror of
https://github.com/pi-hole/PADD.git
synced 2026-04-17 15:34:08 +01:00
Move check for both flags set down
Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
This commit is contained in:
12
padd.sh
12
padd.sh
@@ -105,12 +105,6 @@ TestAPIAvailability() {
|
||||
|
||||
local chaos_api_list authResponse cmdResult digReturnCode authStatus authData apiAvailable
|
||||
|
||||
if [ -n "$API_LOCATION" ] && [ -n "$SERVER" ]; then
|
||||
moveXOffset; echo "Do not set --server and --api simultaneously."
|
||||
moveXOffset; echo "Exiting."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check if an API location was specified with --api
|
||||
if [ -n "${API_LOCATION}" ]; then
|
||||
# The list of available API URLs is just the provided URL
|
||||
@@ -1942,6 +1936,12 @@ while [ "$#" -gt 0 ]; do
|
||||
shift
|
||||
done
|
||||
|
||||
if [ -n "$API_LOCATION" ] && [ -n "$SERVER" ]; then
|
||||
moveXOffset; echo "Do not set --server and --api simultaneously."
|
||||
moveXOffset; echo "Exiting."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "${versionOnly}" ]; then
|
||||
ShowVersion
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user