BastilleBSD/bastille
2
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

Always check if user specified path exist

Browse Source
This commit is contained in:
Jose
2020-04-04 10:23:43 -04:00
parent 7db47f3dac
commit bfa500a183
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
usr/local/share/bastille/export.sh
View File

@@ -102,11 +102,11 @@ if echo "${TARGET}" | grep -q '\/'; then
GETDIR="${TARGET}" GETDIR="${TARGET}"
TARGET=$(echo ${TARGET} | awk -F '\/' '{print $NF}') TARGET=$(echo ${TARGET} | awk -F '\/' '{print $NF}')
bastille_backupsdir=$(echo ${GETDIR} | sed "s/${TARGET}//") bastille_backupsdir=$(echo ${GETDIR} | sed "s/${TARGET}//")
else fi
# Check if backups directory/dataset exist
if [ ! -d "${bastille_backupsdir}" ]; then # Check if backups directory/dataset exist
error_notify "${COLOR_RED}Backups directory/dataset does not exist, See 'bastille bootstrap'.${COLOR_RESET}" if [ ! -d "${bastille_backupsdir}" ]; then
fi error_notify "${COLOR_RED}Backups directory/dataset does not exist, See 'bastille bootstrap'.${COLOR_RESET}"
fi fi
# Check if is a ZFS system # Check if is a ZFS system

10
usr/local/share/bastille/import.sh
View File

@@ -377,11 +377,11 @@ if echo "${TARGET}" | grep -q '\/'; then
GETDIR="${TARGET}" GETDIR="${TARGET}"
TARGET=$(echo ${TARGET} | awk -F '\/' '{print $NF}') TARGET=$(echo ${TARGET} | awk -F '\/' '{print $NF}')
bastille_backupsdir=$(echo ${GETDIR} | sed "s/${TARGET}//") bastille_backupsdir=$(echo ${GETDIR} | sed "s/${TARGET}//")
else fi
# Check if backups directory/dataset exist
if [ ! -d "${bastille_backupsdir}" ]; then # Check if backups directory/dataset exist
error_notify "${COLOR_RED}Backups directory/dataset does not exist, See 'bastille bootstrap'.${COLOR_RESET}" if [ ! -d "${bastille_backupsdir}" ]; then
fi error_notify "${COLOR_RED}Backups directory/dataset does not exist, See 'bastille bootstrap'.${COLOR_RESET}"
fi fi
# Check if archive exist then trim archive name # Check if archive exist then trim archive name