Changeset 19587

Timestamp:

2009-05-25T14:35:31+12:00 (15 years ago)

Author:

oranfry

Message:

keep track of original directory installer was run from

File:

• release-kits/shared/windows/wrapper/wrapper.cpp (modified) (3 diffs)

release-kits/shared/windows/wrapper/wrapper.cpp

@@ -290 +290 @@
     spoof_progress( SPOOF_TIME );
     
+    //get the original working directory
+    char* owd = _getcwd(NULL, 1024);
+    
     //using the users TMP directory for temp files rather than the current directory so
-    //installation from cd works
-    //char* tmp = NULL;
-    //tmp = _getcwd(tmp, 1000);
+    //installation from cdrom works
     char* tmp = getenv( "TMP" );
     char id[6]; for( int i=0; i<5; i++ ) id[i] = (char)((rand()%26) + 97); id[5] = '\0'; //id for this instance
@@ -360 +361 @@
         string cmd = "\"";
         cmd.append( foundJvm.getWinExecutable() );
+        cmd.append( "\" \"-Dorig.dir=" );
+        cmd.append( owd );
         cmd.append( "\" -jar greenstone.jar" );
+        
         
         //hide splash screen
@@ -385 +389 @@
     _rmdir( tempdir.c_str() );
 
+    delete owd;
+    
     return 0;