summaryrefslogtreecommitdiff
path: root/pst/install-4cd-minimal.sh
diff options
context:
space:
mode:
authorNick White <git@njw.me.uk>2009-06-01 23:42:06 +0100
committerNick White <git@njw.me.uk>2009-06-01 23:42:06 +0100
commit520746058d336ffec5a2acdcb757a1d143457b6a (patch)
tree195acbeb539af2fcd33e88548f635a2e7a705555 /pst/install-4cd-minimal.sh
parent15066a0cfaa8ff37e08631d32c030e2982582b90 (diff)
downloadgemrb-gameinstallers-520746058d336ffec5a2acdcb757a1d143457b6a.tar.bz2
gemrb-gameinstallers-520746058d336ffec5a2acdcb757a1d143457b6a.zip
Use move_and_remove everywhere
And ensure parent directories are removed, where appropriate
Diffstat (limited to 'pst/install-4cd-minimal.sh')
-rwxr-xr-xpst/install-4cd-minimal.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/pst/install-4cd-minimal.sh b/pst/install-4cd-minimal.sh
index 8ee12dd..1bcb07b 100755
--- a/pst/install-4cd-minimal.sh
+++ b/pst/install-4cd-minimal.sh
@@ -30,8 +30,7 @@ mkdir -p "$TARGETDIR" || die
unshield -L x "${CDMOUNT}/data1.cab" -d "$TARGETDIR" || die
-cp -R "${TARGETDIR}/program_executable_files/"* "$TARGETDIR" || die
-rm -r "${TARGETDIR}/program_executable_files"
+move_and_remove "${TARGETDIR}/program_executable_files/" "$TARGETDIR"
cp "${CDMOUNT}/torment.ico" "$TARGETDIR" || die