From 4c87d5ebd299fcdb92837744fd0de693c110c940 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 19 Jul 2019 16:48:30 +0200 Subject: [cups-sicgs] Use work dir for download The downloaded files were never cleaned without this --- core/modules/cups-sicgs/module.build | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/modules/cups-sicgs/module.build b/core/modules/cups-sicgs/module.build index 77033092..37c22798 100644 --- a/core/modules/cups-sicgs/module.build +++ b/core/modules/cups-sicgs/module.build @@ -2,16 +2,16 @@ fetch_source() { - [ -s "${MODULE_DIR}/src/driver.zip" ] && return 0 - rm -rf -- "${MODULE_DIR}/src" - mkdir -p "${MODULE_DIR}/src" - download "${REQUIRED_ARCHIVE}" "${MODULE_DIR}/src/driver.zip" + [ -s "${MODULE_WORK_DIR}/src/driver.zip" ] && return 0 + rm -rf -- "${MODULE_WORK_DIR}/src" + mkdir -p "${MODULE_WORK_DIR}/src" + download "${REQUIRED_ARCHIVE}" "${MODULE_WORK_DIR}/src/driver.zip" } build() { - cd "${MODULE_DIR}/src/" || perror "Could not cd to '${MODULE_DIR}/src'. Did fetch_source work?" + cd "${MODULE_WORK_DIR}/src/" || perror "Could not cd to '${MODULE_WORK_DIR}/src'. Did fetch_source work?" # Initial archive is zip - unzip -j -o "${MODULE_DIR}/src/driver.zip" || perror "Could not extract initial driver.zip" + unzip -j -o "${MODULE_WORK_DIR}/src/driver.zip" || perror "Could not extract initial driver.zip" # Then we have two tgz, 32bit and 64bit tar -x -f *${X86_64_I386}*.tar* --wildcards '*/sic*' || perror "Could not extract binaries from inner tar" -- cgit v1.2.3-55-g7522