Skip to content
Snippets Groups Projects
Commit 98194d60 authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

Merge branch '7000-corrections' into 'master'

fix list databases (path with dots cut the name)

See merge request !134
parents b670b29d 0f2eacfa
Branches
No related tags found
1 merge request!134fix list databases (path with dots cut the name)
......@@ -201,16 +201,20 @@
# global string BACKUP_BASEDIR base directory of all backups of selected dbprofile
# param string optional: DB-Name for file filter to select from existing dumps;
function listBackupedDBs(){
local _filter="$1"
if [ -d "${BACKUP_TARGETDIR}" ]; then
if [ -z $1 ]; then
if [ -z "$_filter" ]; then
# list all databases
find "${BACKUP_TARGETDIR}" -mindepth 1 -maxdepth 1 -type f -exec basename {} \; \
| sed "s#__[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]-[0-9][0-9].*##g" \
| sed "s#\..*##g" \
| sort -ud| sed "s#^\./##g"
| sed -e "s#__[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]-[0-9][0-9].*##g" \
-e "s#\.couchdb\.*##g" \
-e "s#\.gz.meta\$##g" \
-e "s#\.gz\$##g" \
| sort -ud \
| sed "s#^\./##g"
else
# list dumps of a database
ls -ltr ${BACKUP_TARGETDIR}/${1}*gz | sed "s,${BACKUP_TARGETDIR}/,,g"
ls -ltr ${BACKUP_TARGETDIR}/${_filter}*gz | sed "s,${BACKUP_TARGETDIR}/,,g"
fi
else
color.echo error "ERROR: ${BACKUP_TARGETDIR} does not exist - here are no backups to restore."
......@@ -271,7 +275,7 @@
;;
1)
echo "INFO: No interaction on a single choice. Using"
echo " $_selection"
color.echo "cmd" " $_selection"
LASTINPUT="$_selection"
return 0
;;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment