diff options
| author | Jonathan Bauer | 2013-03-14 14:55:58 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2013-03-14 14:55:58 +0100 |
| commit | 9f174b2bc64df3ffe83bb7448b76a9f79da96750 (patch) | |
| tree | 46138c2e4efcdcfc23fc79f0a368cca8e454fc06 /remote/setup_tools | |
| parent | new stage3.2 (diff) | |
| download | tm-scripts-9f174b2bc64df3ffe83bb7448b76a9f79da96750.tar.gz tm-scripts-9f174b2bc64df3ffe83bb7448b76a9f79da96750.tar.xz tm-scripts-9f174b2bc64df3ffe83bb7448b76a9f79da96750.zip | |
RIP INIT_DIR
Diffstat (limited to 'remote/setup_tools')
| -rwxr-xr-x | remote/setup_tools | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/remote/setup_tools b/remote/setup_tools index 722dba58..dc7fafda 100755 --- a/remote/setup_tools +++ b/remote/setup_tools @@ -4,8 +4,6 @@ MODE_DIR="${ROOT_DIR}/remote" #Create tools directory if not exists TOOL_DIR="${MODE_DIR}/tools" -INIT_DIR="${MODE_DIR}/stage3.2" - # Keep track of processed modules PROCESSED_MODULES="" @@ -127,7 +125,7 @@ copyfileswithdependencies () { if [ -s "$COPYFILES_LIST" ]; then local CLISTCOUNT=$(cat "$COPYFILES_LIST" | wc -l) pinfo "Copying $CLISTCOUNT files to stage 3.2 target directory." - tarcopy "$(cat "$COPYFILES_LIST"|sort -u)" "${INIT_DIR}" + tarcopy "$(cat "$COPYFILES_LIST"|sort -u)" "${TARGET_BUILD_DIR}" fi } @@ -146,8 +144,6 @@ generate_target() { pinfo "Generating '$TARGET_BUILD_DIR' for '$TARGET'" - INIT_DIR=${TARGET_BUILD_DIR} - # if no arguments assume all. if [ "x$1" = "x" -o "x$1" = "xall" ]; then MODULES=$(ls ${TARGET_DIR}) @@ -230,8 +226,8 @@ process_module() { clean_tools() { if [ "x$1" = "x" -o "x$1" = "xall" ]; then #clean all - if [ -d ${INIT_DIR} ]; then - rm -rf "${INIT_DIR}"/* || perror "Error deleting $INIT_DIR" + if [ -d ${TARGET_BUILD_DIR} ]; then + rm -rf "${TARGET_BUILD_DIR}"/* || perror "Error deleting $TARGET_BUILD_DIR" fi for TOOL in $(ls ${TOOL_DIR}); do clean_tool $TOOL @@ -247,9 +243,9 @@ clean_tools() { clean_tool() { TOOLDIR=${TOOL_DIR}/$1 pinfo "Cleaning '${TOOLDIR}'..." - #[ -e ${TOOLDIR}/build/list_wanted_stage3.2 ] && cd ${INIT_DIR} \ + #[ -e ${TOOLDIR}/build/list_wanted_stage3.2 ] && cd ${TARGET_BUILD_DIR} \ # && xargs rm < ${TOOLDIR}/build/list_wanted_stage3.2 - #[ -d ${TOOLDIR}/data ] && cd ${INIT_DIR} \ + #[ -d ${TOOLDIR}/data ] && cd ${TARGET_BUILD_DIR} \ # && xargs rm < $(find ${TOOLDIR}/data -type f) if [ -e ${TOOLDIR}/.built ]; then rm "${TOOLDIR}/.built" || perror "Could not clear built flag" |