diff options
| author | Renato Botelho <renato@netgate.com> | 2016-08-02 16:02:00 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-08-02 16:02:12 -0300 |
| commit | 22ba6bf2358ee2c951adf246a9869628936344e4 (patch) | |
| tree | 881826d8c785a7a461ba7b98676f9a194b1a2d70 /build/scripts | |
| parent | a07126aa749eaa846e59b98f2b13d003c007572c (diff) | |
| download | pfsense-22ba6bf2358ee2c951adf246a9869628936344e4.zip pfsense-22ba6bf2358ee2c951adf246a9869628936344e4.tar.gz | |
Force removal of temporary directory and disable trap
Diffstat (limited to 'build/scripts')
| -rwxr-xr-x | build/scripts/create_core_pkg.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/build/scripts/create_core_pkg.sh b/build/scripts/create_core_pkg.sh index 8712398..40128a1 100755 --- a/build/scripts/create_core_pkg.sh +++ b/build/scripts/create_core_pkg.sh @@ -108,7 +108,7 @@ scratchdir=$(mktemp -d -q ${TMPDIR}/${template_name}.XXXXXXX) [ -n "${scratchdir}" -a -d ${scratchdir} ] \ || err "error creating temporary directory" -trap "rm -rf ${scratchdir}" 1 2 15 EXIT +trap "force_rm ${scratchdir}" 1 2 15 EXIT metadir=${scratchdir}/${template_name}_metadir @@ -170,3 +170,6 @@ fi run "Creating core package ${template_name}" \ "pkg create -o ${destdir} -p ${plist} -r ${root} -m ${metadir}" + +force_rm ${scratchdir} +trap "-" 1 2 15 EXIT |
