From 89a5584631b2ae767450061f99ac44b35bfd7909 Mon Sep 17 00:00:00 2001 From: bedefaced Date: Wed, 30 Aug 2017 14:11:51 +0300 Subject: [PATCH] check file before copying --- ipsec/backup.sh | 28 +++++++++++++++++++++------- pptp/backup.sh | 12 +++++++++--- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/ipsec/backup.sh b/ipsec/backup.sh index d03c1ba..d049d54 100755 --- a/ipsec/backup.sh +++ b/ipsec/backup.sh @@ -128,24 +128,38 @@ fi # restore files echo -e "echo \"Restoring configs...\"" >>$UNINSTALL_SCRIPT if [[ -n "$(which pppd)" ]]; then - echo -e "cp -i \"\$DIR/options.xl2tpd\" $PPPCONFIG" >>$UNINSTALL_SCRIPT - echo -e "cp -i \"\$DIR/chap-secrets\" $CHAPSECRETS" >>$UNINSTALL_SCRIPT + if [ -e "$DIR/options.xl2tpd" ]; then + echo -e "cp -i \"\$DIR/options.xl2tpd\" $PPPCONFIG" >>$UNINSTALL_SCRIPT + fi + if [ -e "$DIR/chap-secrets" ]; then + echo -e "cp -i \"\$DIR/chap-secrets\" $CHAPSECRETS" >>$UNINSTALL_SCRIPT + fi fi if [[ -n "$(which xl2tpd)" ]]; then - echo -e "cp -i \"\$DIR/xl2tpd.conf\" $XL2TPDCONFIG" >>$UNINSTALL_SCRIPT + if [ -e "$DIR/xl2tpd.conf" ]; then + echo -e "cp -i \"\$DIR/xl2tpd.conf\" $XL2TPDCONFIG" >>$UNINSTALL_SCRIPT + fi fi if [ "$PLATFORM" == "$CENTOSPLATFORM" ]; then if [[ -n "$(which strongswan)" ]]; then - echo -e "cp -i \"\$DIR/ipsec.secrets\" $SECRETSFILE" >>$UNINSTALL_SCRIPT - echo -e "cp -i \"\$DIR/ipsec.conf\" $IPSECCONFIG" >>$UNINSTALL_SCRIPT + if [ -e "$DIR/ipsec.secrets" ]; then + echo -e "cp -i \"\$DIR/ipsec.secrets\" $SECRETSFILE" >>$UNINSTALL_SCRIPT + fi + if [ -e "$DIR/ipsec.conf" ]; then + echo -e "cp -i \"\$DIR/ipsec.conf\" $IPSECCONFIG" >>$UNINSTALL_SCRIPT + fi fi fi if [ "$PLATFORM" == "$DEBIANPLATFORM" ]; then if [[ -n "$(which ipsec)" ]]; then - echo -e "cp -i \"\$DIR/ipsec.secrets\" $SECRETSFILE" >>$UNINSTALL_SCRIPT - echo -e "cp -i \"\$DIR/ipsec.conf\" $IPSECCONFIG" >>$UNINSTALL_SCRIPT + if [ -e "$DIR/ipsec.secrets" ]; then + echo -e "cp -i \"\$DIR/ipsec.secrets\" $SECRETSFILE" >>$UNINSTALL_SCRIPT + fi + if [ -e "$DIR/ipsec.conf" ]; then + echo -e "cp -i \"\$DIR/ipsec.conf\" $IPSECCONFIG" >>$UNINSTALL_SCRIPT + fi fi fi diff --git a/pptp/backup.sh b/pptp/backup.sh index d65f646..8a520fc 100755 --- a/pptp/backup.sh +++ b/pptp/backup.sh @@ -115,11 +115,17 @@ fi # restore files echo -e "echo \"Restoring configs...\"" >>$UNINSTALL_SCRIPT if [[ -n "$(which pptpd)" ]]; then - echo -e "cp -i \"\$DIR/pptpd.conf\" $PPTPDCONFIG" >>$UNINSTALL_SCRIPT + if [ -e "$DIR/pptpd.conf" ]; then + echo -e "cp -i \"\$DIR/pptpd.conf\" $PPTPDCONFIG" >>$UNINSTALL_SCRIPT + fi fi if [[ -n "$(which pppd)" ]]; then - echo -e "cp -i \"\$DIR/options.pptp\" $PPTPOPTIONS" >>$UNINSTALL_SCRIPT - echo -e "cp -i \"\$DIR/chap-secrets\" $CHAPSECRETS" >>$UNINSTALL_SCRIPT + if [ -e "$DIR/options.pptp" ]; then + echo -e "cp -i \"\$DIR/options.pptp\" $PPTPOPTIONS" >>$UNINSTALL_SCRIPT + fi + if [ -e "$DIR/chap-secrets" ]; then + echo -e "cp -i \"\$DIR/chap-secrets\" $CHAPSECRETS" >>$UNINSTALL_SCRIPT + fi fi # restore pptpd if necessary