fixes
This commit is contained in:
@@ -6,14 +6,8 @@
|
||||
|
||||
ip_version="$1"
|
||||
if [ -z "${ip_version:-}" ] || ([ "$ip_version" != 4 ] && [ "$ip_version" != 6 ]); then
|
||||
echo "Error: no valid IP version provided" &>2
|
||||
echo "Usage: dyndns.bash <4|6>" &>2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
IP="$(./get_ip_addr.sh $ip_version)"
|
||||
if [ -z "$IP" ]; then
|
||||
echo "Error: could not find IP address" &>2
|
||||
echo "Error: no valid IP version provided" >&2
|
||||
echo "Usage: dyndns.bash <4|6>" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -21,6 +15,12 @@ SCRIPT="$0"
|
||||
SCRIPT_DIR=$(cd "${SCRIPT%/*}" && pwd )
|
||||
SCRIPT_NAME=${SCRIPT##*/}
|
||||
|
||||
IP="$($SCRIPT_DIR/get_ip_addr.sh $ip_version)"
|
||||
if [ -z "$IP" ]; then
|
||||
echo "Error: could not find IP address" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
REPEAT_CHECK_DIR=$SCRIPT_DIR
|
||||
REPEAT_CHECK_A=$REPEAT_CHECK_DIR/REPEAT_CHECK_A
|
||||
REPEAT_CHECK_AAAA=$REPEAT_CHECK_DIR/REPEAT_CHECK_AAAA
|
||||
|
||||
+3
-3
@@ -2,7 +2,7 @@
|
||||
|
||||
ip_version="$1"
|
||||
if [ -z "${ip_version:-}" ] || ([ "$ip_version" != 4 ] && [ "$ip_version" != 6 ]); then
|
||||
echo "Usage: get_ip_addr <4|6>" &>2
|
||||
echo "Usage: get_ip_addr <4|6>" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -15,13 +15,13 @@ set -eu
|
||||
CONN_NAME=${CONN_NAME:-nevis}
|
||||
conn_device_name="$(nmcli --fields NAME,DEVICE con show | grep ^$CONN_NAME | sed 's/\s\+/ /g' | cut -d' ' -f 2)"
|
||||
if [ -z "${conn_device_name:-}" ]; then
|
||||
echo "Could not find the connection device name for connection: \"$CONN_NAME\"" &>2
|
||||
echo "Could not find the connection device name for connection: \"$CONN_NAME\"" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
device_line_no="$(ip addr | grep -En ^[0-9]+:\ $conn_device_name | cut -d':' -f 1)"
|
||||
if [ -z "${device_line_no:-}" ]; then
|
||||
echo "Could not find device: \"$conn_device_name\" in output of ip addr" &>2
|
||||
echo "Could not find device: \"$conn_device_name\" in output of ip addr" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user