Use globs, set nullglob, and remove stdout redirection for import

This commit is contained in:
rhy-jot
2013-11-20 15:40:17 -08:00
parent d11f732595
commit e8037da726
5 changed files with 9 additions and 5 deletions

View File

@@ -57,7 +57,7 @@ set -e; case "$1" in
TARGET_DIR="$DOKKU_ROOT" TARGET_DIR="$DOKKU_ROOT"
# create all the app directories # create all the app directories
while read app; do mkdir "$TARGET_DIR/$app"; echo "Imported $app"; done < $BACKUP_TMP_DIR/.dokku_backup_apps > /dev/null while read app; do mkdir "$TARGET_DIR/$app"; echo "Imported $app"; done < $BACKUP_TMP_DIR/.dokku_backup_apps
# have the plugins import their stuff # have the plugins import their stuff
pluginhook backup-import $VERSION "$BACKUP_ROOT" $TARGET_DIR "$BACKUP_TMP_DIR/.dokku_backup_apps" pluginhook backup-import $VERSION "$BACKUP_ROOT" $TARGET_DIR "$BACKUP_TMP_DIR/.dokku_backup_apps"

View File

@@ -1,6 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
shopt -s nullglob
VERSION="$1" VERSION="$1"
BASE_DIR="$2" BASE_DIR="$2"
cat; find $BASE_DIR -regex ".*/ENV" cat; for i in $BASE_DIR/*/ENV; do echo $i; done

View File

@@ -1,10 +1,11 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
shopt -s nullglob
VERSION="$1" VERSION="$1"
IMPORT_DIR="$2" IMPORT_DIR="$2"
TARGET_DIR="$3" TARGET_DIR="$3"
cd $IMPORT_DIR cd $IMPORT_DIR
for file in `find . -regex ".*/ENV"`; do for file in */ENV; do
cp $file "$TARGET_DIR/$file" cp $file "$TARGET_DIR/$file"
done done

View File

@@ -1,6 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
shopt -s nullglob
VERSION="$1" VERSION="$1"
BASE_DIR="$2" BASE_DIR="$2"
cat; find $BASE_DIR -regex ".*ssl/server\(.crt\|.key\)"; cat; for i in $BASE_DIR/*/ssl/server.*; do echo $i; done

View File

@@ -1,12 +1,13 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
shopt -s nullglob
VERSION="$1" VERSION="$1"
IMPORT_DIR="$2" IMPORT_DIR="$2"
TARGET_DIR="$3" TARGET_DIR="$3"
cd $IMPORT_DIR cd $IMPORT_DIR
for file in `find . -regex ".*ssl/server\(.crt\|.key\)"`; do for file in */ssl/server.*; do
mkdir -p $(dirname $TARGET_DIR$file) mkdir -p $(dirname $TARGET_DIR$file)
cp $file $TARGET_DIR$file cp $file $TARGET_DIR$file
done done