summaryrefslogtreecommitdiff
path: root/indra/mac_updater/mac_updater.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-08 17:34:49 -0400
committerOz Linden <oz@lindenlab.com>2011-04-08 17:34:49 -0400
commit51b75b883269a0a78a9428a690324c17abf028c1 (patch)
tree56e131516119cf7c6fef2219ca8b8b454ceab0c0 /indra/mac_updater/mac_updater.cpp
parentc4ec708922ad5d4a5844b90b8042a939a34733ac (diff)
parentdf329d14a9b882f1bc9c2c598043569ca2688c03 (diff)
merge changes for storm-1108
Diffstat (limited to 'indra/mac_updater/mac_updater.cpp')
-rw-r--r--indra/mac_updater/mac_updater.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/indra/mac_updater/mac_updater.cpp b/indra/mac_updater/mac_updater.cpp
index 5d19e8a889..809f66cb1d 100644
--- a/indra/mac_updater/mac_updater.cpp
+++ b/indra/mac_updater/mac_updater.cpp
@@ -1230,20 +1230,14 @@ void *updatethreadproc(void*)
// Move work directory to the trash
if(tempDir[0] != 0)
{
-// chdir("/");
-// FSDeleteObjects(tempDirRef);
-
llinfos << "Moving work directory to the trash." << llendl;
- err = FSMoveObject(&tempDirRef, &trashFolderRef, NULL);
+ FSRef trashRef;
+ OSStatus err = FSMoveObjectToTrashSync(&tempDirRef, &trashRef, 0);
if(err != noErr) {
llwarns << "failed to move files to trash, (error code " <<
err << ")" << llendl;
}
-
-// snprintf(temp, sizeof(temp), "rm -rf '%s'", tempDir);
-// printf("%s\n", temp);
-// system(temp);
}
if(!gCancelled && !gFailure && (target[0] != 0))