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

Allow the user specify path for Export/Import on-the-fly

Browse Source
This commit is contained in:
Jose
2020-04-04 09:46:56 -04:00
parent c2fefc5f16
commit 7db47f3dac
2 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -238,17 +238,19 @@ config_netif() {
update_symlinks() { update_symlinks() {
# Work with the symlinks # Work with the symlinks
SYMLINKS="bin boot lib libexec rescue sbin usr/bin usr/include usr/lib usr/lib32 usr/libdata usr/libexec usr/ports usr/sbin usr/share usr/src" SYMLINKS="bin boot lib libexec rescue sbin usr/bin usr/include usr/lib usr/lib32 usr/libdata usr/libexec usr/ports usr/sbin usr/share usr/src"
if [ -d "${bastille_releasesdir}/${CONFIG_RELEASE}" ]; then
# Update old symlinks # Just warn user to bootstrap the release if missing
echo -e "${COLOR_GREEN}Updating symlinks...${COLOR_RESET}" if [ ! -d "${bastille_releasesdir}/${CONFIG_RELEASE}" ]; then
for _link in ${SYMLINKS}; do echo -e "${COLOR_YELLOW}Warning: ${CONFIG_RELEASE} must be bootstrapped, See 'bastille bootstrap'.${COLOR_RESET}"
if [ -L "${_link}" ]; then
ln -sf /.bastille/${_link} ${_link}
fi
done
else
error_notify "${COLOR_RED}Release must be bootstrapped first, See 'bastille bootstrap'.${COLOR_RESET}"
fi fi
# Update old symlinks
echo -e "${COLOR_GREEN}Updating symlinks...${COLOR_RESET}"
for _link in ${SYMLINKS}; do
if [ -L "${_link}" ]; then
ln -sf /.bastille/${_link} ${_link}
fi
done
} }
jail_import() { jail_import() {
@@ -370,14 +372,23 @@ jail_import() {
fi fi
} }
# Check if backups directory/dataset exist # Check for user specified file location
if [ ! -d "${bastille_backupsdir}" ]; then if echo "${TARGET}" | grep -q '\/'; then
error_notify "${COLOR_RED}Backups directory/dataset does not exist, See 'bastille bootstrap'.${COLOR_RESET}" GETDIR="${TARGET}"
TARGET=$(echo ${TARGET} | awk -F '\/' '{print $NF}')
bastille_backupsdir=$(echo ${GETDIR} | sed "s/${TARGET}//")
else
# Check if backups directory/dataset exist
if [ ! -d "${bastille_backupsdir}" ]; then
error_notify "${COLOR_RED}Backups directory/dataset does not exist, See 'bastille bootstrap'.${COLOR_RESET}"
fi
fi fi
# Check if archive exist then trim archive name # Check if archive exist then trim archive name
if ls "${bastille_backupsdir}" | awk "/^${TARGET}$/" >/dev/null; then if [ -f "${bastille_backupsdir}/${TARGET}" ]; then
TARGET_TRIM=$(echo "${TARGET}" | sed "s/_[0-9]*-[0-9]*-[0-9]*-[0-9]*.[txz]\{2,3\}//g;s/_[0-9]*-[0-9]*-[0-9]*.zip//g;s/-[0-9]\{12\}.[0-9]\{2\}.tar.gz//g") if ls "${bastille_backupsdir}" | awk "/^${TARGET}$/" >/dev/null; then
TARGET_TRIM=$(echo "${TARGET}" | sed "s/_[0-9]*-[0-9]*-[0-9]*-[0-9]*.[txz]\{2,3\}//g;s/_[0-9]*-[0-9]*-[0-9]*.zip//g;s/-[0-9]\{12\}.[0-9]\{2\}.tar.gz//g")
fi
else else
error_notify "${COLOR_RED}Archive '${TARGET}' not found.${COLOR_RESET}" error_notify "${COLOR_RED}Archive '${TARGET}' not found.${COLOR_RESET}"
fi fi