From 8d8f19d951b83d241885a323ef846500ce588b72 Mon Sep 17 00:00:00 2001 From: Kyle Manna Date: Sat, 7 Mar 2015 16:35:08 -0800 Subject: [PATCH] genconfig: Describe backup conf deletion * Handle back-up configuration deletion better by informing the user why the back-up vanished and why. * Closes #33 --- bin/ovpn_genconfig | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/bin/ovpn_genconfig b/bin/ovpn_genconfig index 463e537..a4a829e 100755 --- a/bin/ovpn_genconfig +++ b/bin/ovpn_genconfig @@ -193,8 +193,14 @@ for i in "${OVPN_PUSH[@]}"; do echo push \"$i\" >> "$conf" done -# Clean-up duplicate configs (always return success) -diff -q "$bak_env" "$OVPN_ENV" 2> /dev/null && rm "$bak_env" || true -diff -q "$bak" "$conf" 2> /dev/null && rm "$bak" || true +# Clean-up duplicate configs +if diff -q "$bak_env" "$OVPN_ENV"; then + echo "Removing duplicate back-up: $bak_env" + rm -fv "$bak_env" +fi +if diff -q "$bak" "$conf"; then + echo "Removing duplicate back-up: $bak" + rm -fv "$bak" +fi echo "Successfully generated config"