You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/12/29 17:50:07 UTC
karaf git commit: Delete only the content of KARAF_DATA and not the
folder itself when starting with clean option.
Repository: karaf
Updated Branches:
refs/heads/master b318e0002 -> c6beae077
Delete only the content of KARAF_DATA and not the folder itself when starting with clean option.
Signed-off-by: Davy Vanherbergen <da...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c6beae07
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c6beae07
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c6beae07
Branch: refs/heads/master
Commit: c6beae07723f00bc2fb00bf149d0a14a03a1caf6
Parents: b318e00
Author: Davy Vanherbergen <da...@gmail.com>
Authored: Tue Dec 29 14:08:50 2015 +0100
Committer: Davy Vanherbergen <da...@gmail.com>
Committed: Tue Dec 29 14:08:50 2015 +0100
----------------------------------------------------------------------
assemblies/features/base/src/main/resources/resources/bin/karaf | 2 +-
.../features/base/src/main/resources/resources/bin/karaf.bat | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/c6beae07/assemblies/features/base/src/main/resources/resources/bin/karaf
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/resources/resources/bin/karaf b/assemblies/features/base/src/main/resources/resources/bin/karaf
index f2004c0..4bdc6a7 100755
--- a/assemblies/features/base/src/main/resources/resources/bin/karaf
+++ b/assemblies/features/base/src/main/resources/resources/bin/karaf
@@ -369,7 +369,7 @@ run() {
while [ "$1" != "" ]; do
case $1 in
'clean')
- rm -Rf "$KARAF_DATA"
+ rm -Rf "$KARAF_DATA/**"
shift
;;
'debug')
http://git-wip-us.apache.org/repos/asf/karaf/blob/c6beae07/assemblies/features/base/src/main/resources/resources/bin/karaf.bat
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/resources/resources/bin/karaf.bat b/assemblies/features/base/src/main/resources/resources/bin/karaf.bat
index 464268a..89d8ff6 100644
--- a/assemblies/features/base/src/main/resources/resources/bin/karaf.bat
+++ b/assemblies/features/base/src/main/resources/resources/bin/karaf.bat
@@ -314,7 +314,7 @@ if "%KARAF_PROFILER%" == "" goto :RUN
goto :RUN_LOOP
:EXECUTE_CLEAN
- rmdir /S /Q "%KARAF_DATA%"
+ pushd "%KARAF_DATA%" && (rmdir /S /Q "%KARAF_DATA%" 2>nul & popd)
shift
goto :RUN_LOOP