Cleanup
This commit is contained in:
parent
d2da364e16
commit
46a83e4f9f
@ -202,15 +202,17 @@ get_swan_ver() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
check_libreswan() {
|
check_libreswan() {
|
||||||
ipsec_bin="/usr/local/sbin/ipsec"
|
|
||||||
ipsec_ver=$(/usr/local/sbin/ipsec --version 2>/dev/null)
|
ipsec_ver=$(/usr/local/sbin/ipsec --version 2>/dev/null)
|
||||||
swan_ver_old=$(printf '%s' "$ipsec_ver" | sed -e 's/.*Libreswan U\?//' -e 's/\( (\|\/K\).*//')
|
swan_ver_old=$(printf '%s' "$ipsec_ver" | sed -e 's/.*Libreswan U\?//' -e 's/\( (\|\/K\).*//')
|
||||||
|
ipsec_bin="/usr/local/sbin/ipsec"
|
||||||
if [ -n "$swan_ver_old" ] && printf '%s' "$ipsec_ver" | grep -qi 'libreswan' \
|
if [ -n "$swan_ver_old" ] && printf '%s' "$ipsec_ver" | grep -qi 'libreswan' \
|
||||||
&& [ "$(find "$ipsec_bin" -mmin -10080)" ]; then
|
&& [ "$(find "$ipsec_bin" -mmin -10080)" ]; then
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
[ -s "$ipsec_bin" ] && touch "$ipsec_bin"
|
|
||||||
get_swan_ver
|
get_swan_ver
|
||||||
|
if [ -s "$ipsec_bin" ] && [ "$swan_ver_old" = "$SWAN_VER" ]; then
|
||||||
|
touch "$ipsec_bin"
|
||||||
|
fi
|
||||||
[ "$swan_ver_old" = "$SWAN_VER" ]
|
[ "$swan_ver_old" = "$SWAN_VER" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -202,15 +202,17 @@ get_swan_ver() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
check_libreswan() {
|
check_libreswan() {
|
||||||
ipsec_bin="/usr/local/sbin/ipsec"
|
|
||||||
ipsec_ver=$(/usr/local/sbin/ipsec --version 2>/dev/null)
|
ipsec_ver=$(/usr/local/sbin/ipsec --version 2>/dev/null)
|
||||||
swan_ver_old=$(printf '%s' "$ipsec_ver" | sed -e 's/.*Libreswan U\?//' -e 's/\( (\|\/K\).*//')
|
swan_ver_old=$(printf '%s' "$ipsec_ver" | sed -e 's/.*Libreswan U\?//' -e 's/\( (\|\/K\).*//')
|
||||||
|
ipsec_bin="/usr/local/sbin/ipsec"
|
||||||
if [ -n "$swan_ver_old" ] && printf '%s' "$ipsec_ver" | grep -qi 'libreswan' \
|
if [ -n "$swan_ver_old" ] && printf '%s' "$ipsec_ver" | grep -qi 'libreswan' \
|
||||||
&& [ "$(find "$ipsec_bin" -mmin -10080)" ]; then
|
&& [ "$(find "$ipsec_bin" -mmin -10080)" ]; then
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
[ -s "$ipsec_bin" ] && touch "$ipsec_bin"
|
|
||||||
get_swan_ver
|
get_swan_ver
|
||||||
|
if [ -s "$ipsec_bin" ] && [ "$swan_ver_old" = "$SWAN_VER" ]; then
|
||||||
|
touch "$ipsec_bin"
|
||||||
|
fi
|
||||||
[ "$swan_ver_old" = "$SWAN_VER" ]
|
[ "$swan_ver_old" = "$SWAN_VER" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -259,15 +259,17 @@ get_swan_ver() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
check_libreswan() {
|
check_libreswan() {
|
||||||
ipsec_bin="/usr/local/sbin/ipsec"
|
|
||||||
ipsec_ver=$(/usr/local/sbin/ipsec --version 2>/dev/null)
|
ipsec_ver=$(/usr/local/sbin/ipsec --version 2>/dev/null)
|
||||||
swan_ver_old=$(printf '%s' "$ipsec_ver" | sed -e 's/.*Libreswan U\?//' -e 's/\( (\|\/K\).*//')
|
swan_ver_old=$(printf '%s' "$ipsec_ver" | sed -e 's/.*Libreswan U\?//' -e 's/\( (\|\/K\).*//')
|
||||||
|
ipsec_bin="/usr/local/sbin/ipsec"
|
||||||
if [ -n "$swan_ver_old" ] && printf '%s' "$ipsec_ver" | grep -qi 'libreswan' \
|
if [ -n "$swan_ver_old" ] && printf '%s' "$ipsec_ver" | grep -qi 'libreswan' \
|
||||||
&& [ "$(find "$ipsec_bin" -mmin -10080)" ]; then
|
&& [ "$(find "$ipsec_bin" -mmin -10080)" ]; then
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
[ -s "$ipsec_bin" ] && touch "$ipsec_bin"
|
|
||||||
get_swan_ver
|
get_swan_ver
|
||||||
|
if [ -s "$ipsec_bin" ] && [ "$swan_ver_old" = "$SWAN_VER" ]; then
|
||||||
|
touch "$ipsec_bin"
|
||||||
|
fi
|
||||||
[ "$swan_ver_old" = "$SWAN_VER" ]
|
[ "$swan_ver_old" = "$SWAN_VER" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -242,15 +242,17 @@ get_swan_ver() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
check_libreswan() {
|
check_libreswan() {
|
||||||
ipsec_bin="/usr/local/sbin/ipsec"
|
|
||||||
ipsec_ver=$(/usr/local/sbin/ipsec --version 2>/dev/null)
|
ipsec_ver=$(/usr/local/sbin/ipsec --version 2>/dev/null)
|
||||||
swan_ver_old=$(printf '%s' "$ipsec_ver" | sed -e 's/.*Libreswan U\?//' -e 's/\( (\|\/K\).*//')
|
swan_ver_old=$(printf '%s' "$ipsec_ver" | sed -e 's/.*Libreswan U\?//' -e 's/\( (\|\/K\).*//')
|
||||||
|
ipsec_bin="/usr/local/sbin/ipsec"
|
||||||
if [ -n "$swan_ver_old" ] && printf '%s' "$ipsec_ver" | grep -qi 'libreswan' \
|
if [ -n "$swan_ver_old" ] && printf '%s' "$ipsec_ver" | grep -qi 'libreswan' \
|
||||||
&& [ "$(find "$ipsec_bin" -mmin -10080)" ]; then
|
&& [ "$(find "$ipsec_bin" -mmin -10080)" ]; then
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
[ -s "$ipsec_bin" ] && touch "$ipsec_bin"
|
|
||||||
get_swan_ver
|
get_swan_ver
|
||||||
|
if [ -s "$ipsec_bin" ] && [ "$swan_ver_old" = "$SWAN_VER" ]; then
|
||||||
|
touch "$ipsec_bin"
|
||||||
|
fi
|
||||||
[ "$swan_ver_old" = "$SWAN_VER" ]
|
[ "$swan_ver_old" = "$SWAN_VER" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user