From 14a34d4c21e5b0b323e674a3be409c41d0872afa Mon Sep 17 00:00:00 2001 From: "Fred T. Hamster" Date: Tue, 17 Jan 2012 21:23:23 -0500 Subject: [PATCH] different temporary dir. plus may have found real problem in builds. --- production/paths.ini | 2 +- production/setup_src/autotesting_tools/paths.ini | 2 +- scripts/generator/whack_build.sh | 10 +++------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/production/paths.ini b/production/paths.ini index 6f28557c..c7b2ef18 100644 --- a/production/paths.ini +++ b/production/paths.ini @@ -1,3 +1,3 @@ [Common] -LogPath=$REPOSITORY_DIR/logs +LogPath=$TMP/logs diff --git a/production/setup_src/autotesting_tools/paths.ini b/production/setup_src/autotesting_tools/paths.ini index 6f28557c..c7b2ef18 100644 --- a/production/setup_src/autotesting_tools/paths.ini +++ b/production/setup_src/autotesting_tools/paths.ini @@ -1,3 +1,3 @@ [Common] -LogPath=$REPOSITORY_DIR/logs +LogPath=$TMP/logs diff --git a/scripts/generator/whack_build.sh b/scripts/generator/whack_build.sh index 870b285c..fc391248 100644 --- a/scripts/generator/whack_build.sh +++ b/scripts/generator/whack_build.sh @@ -30,12 +30,12 @@ function whack_single_build_area() # avoid accidentally removing way too much important stuff if our variables have not # been previously established. - local WASTE_DIR="$CLEANING_LOCALE/waste" - local TEMPORARIES_DIR="$CLEANING_LOCALE/temporaries" + local WASTE_DIR="$CLEANING_TOP/waste" + local TEMPORARIES_DIR="$CLEANING_TOP/temporaries" # kerzap. rm -rf \ - "$CLEANING_TOP/generatedJUnitFiles" \ + "$REPOSITORY_DIR/generatedJUnitFiles" \ "$CLEANING_TOP/binaries" \ "$CLEANING_TOP/install" \ "$CLEANING_TOP/logs" \ @@ -53,9 +53,7 @@ function whack_single_build_area() fi echo $(date): "Cleaned [$choprepo]." - rm -rf "$NEW_TMP" - return 0 } @@ -65,5 +63,3 @@ function whack_single_build_area() whack_single_build_area "$REPOSITORY_DIR" - - -- 2.34.1