[72193] users/ryandesign/PCLauncher/PCLauncher.applescript

[ryandesign at macports.org]

Revision: 72193
          http://trac.macports.org/changeset/72193
Author:   ryandesign at macports.org
Date:     2010-10-06 05:44:02 -0700 (Wed, 06 Oct 2010)
Log Message:
-----------
Unique variables for each invocation of an external tool, even if it's the same tool

Modified Paths:
--------------
    users/ryandesign/PCLauncher/PCLauncher.applescript

Modified: users/ryandesign/PCLauncher/PCLauncher.applescript
===================================================================
--- users/ryandesign/PCLauncher/PCLauncher.applescript	2010-10-06 12:43:06 UTC (rev 72192)
+++ users/ryandesign/PCLauncher/PCLauncher.applescript	2010-10-06 12:44:02 UTC (rev 72193)
@@ -8,7 +8,11 @@
 -- Paths
 property gPrefix : "/opt/local"
 property gDrizzle : gPrefix & "/bin/drizzle"
+property gDrizzleForDownload : gDrizzle
+property gDrizzleForExtract : gDrizzle
 property gPlasmaClient : gPrefix & "/bin/PlasmaClient"
+property gPlasmaClientForAuth : gPlasmaClient
+property gPlasmaClientForGame : gPlasmaClient
 property gDataDirectory : gPrefix & "/share/mystonline/data"
 property gPythonDirectory : gDataDirectory & "/python"
 property gSdlDirectory : gDataDirectory & "/SDL"
@@ -91,7 +95,7 @@
 	end tell
 	
 	set gStatusFile to makeTempFile()
-	set gPid to (do shell script "(" & gPlasmaClient & " " & quoted form of theUsername & " " & quoted form of thePassword & " -t >& /dev/null; echo $?) >& " & quoted form of gStatusFile & " & echo $!")
+	set gPid to (do shell script "(" & gPlasmaClientForAuth & " " & quoted form of theUsername & " " & quoted form of thePassword & " -t >& /dev/null; echo $?) >& " & quoted form of gStatusFile & " & echo $!")
 	set gTask to kTaskWaitForAuthentication
 end startAuthentication
 
@@ -131,7 +135,7 @@
 	
 	set gStatusFile to makeTempFile()
 	set gSecureFilesDirectory to makeTempDirectory()
-	set gPid to (do shell script gDrizzle & " -downloadsecuremoulagainfiles " & quoted form of theUsername & " " & quoted form of thePassword & " " & quoted form of gSecureFilesDirectory & " >& " & quoted form of gStatusFile & " & echo $!")
+	set gPid to (do shell script gDrizzleForDownload & " -downloadsecuremoulagainfiles " & quoted form of theUsername & " " & quoted form of thePassword & " " & quoted form of gSecureFilesDirectory & " >& " & quoted form of gStatusFile & " & echo $!")
 	set gTask to kTaskWaitForSecureFilesToDownload
 end startDownloadingSecureFiles
 
@@ -164,7 +168,7 @@
 	showProgressPanel("Extracting secure game files…")
 	
 	set gStatusFile to makeTempFile()
-	set gPid to (do shell script gDrizzle & " -decompilepak " & quoted form of (gSecureFilesDirectory & "/Python/python.pak") & " " & quoted form of (gSecureFilesDirectory & "/Python/python") & " moul >& " & quoted form of gStatusFile & " & echo $!")
+	set gPid to (do shell script gDrizzleForExtract & " -decompilepak " & quoted form of (gSecureFilesDirectory & "/Python/python.pak") & " " & quoted form of (gSecureFilesDirectory & "/Python/python") & " moul >& " & quoted form of gStatusFile & " & echo $!")
 	set gTask to kTaskWaitForSecureFilesToExtract
 end startExtractingSecureFiles
 
@@ -209,7 +213,7 @@
 		set thePassword to contents of text field "Password Field"
 	end tell
 	
-	set gPid to (do shell script "(cd " & quoted form of gDataDirectory & " && " & gPlasmaClient & " " & quoted form of theUsername & " " & quoted form of thePassword & ") &>/dev/null & echo $!")
+	set gPid to (do shell script "(cd " & quoted form of gDataDirectory & " && " & gPlasmaClientForGame & " " & quoted form of theUsername & " " & quoted form of thePassword & ") &>/dev/null & echo $!")
 	
 	quit
 end startGame
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101006/25af0cef/attachment.html>