[tuxdroid-svn] r4780 - software_suite_v3/smart-core/smart-server/trunk
Status: Beta
Brought to you by:
ks156
|
From: remi <c2m...@c2...> - 2009-06-11 13:22:32
|
Author: remi
Date: 2009-06-11 14:16:08 +0200 (Thu, 11 Jun 2009)
New Revision: 4780
Modified:
software_suite_v3/smart-core/smart-server/trunk/installer.nsi
Log:
* Install for all users
Modified: software_suite_v3/smart-core/smart-server/trunk/installer.nsi
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/installer.nsi 2009-06-11 12:00:23 UTC (rev 4779)
+++ software_suite_v3/smart-core/smart-server/trunk/installer.nsi 2009-06-11 12:16:08 UTC (rev 4780)
@@ -89,6 +89,8 @@
SetOutPath "$TUXDROID_PATH\resources\images"
File tuxsys.ico
+ ; Reveal shortcuts to all users
+ SetShellVarContext all
; Write shortcut in start menu
CreateDirectory "$SMPROGRAMS\Tux Droid"
CreateDirectory "$SMPROGRAMS\Tux Droid\Smart-Core"
@@ -100,7 +102,7 @@
; Write the uninstall file
WriteUninstaller "$UNINSTALLERS_SUB_PATH\${UNINSTALLER_EXE}"
-
+
; Start the server is requested
Push "START" ; push the search string onto the stack
Push "false" ; push a default value onto the stack
@@ -124,7 +126,7 @@
Processes::KillProcess "java"
Processes::KillProcess "javaw"
Processes::KillProcess "tux_wifi_channel"
-
+
; Get the Tuxdroid installation paths
ReadRegStr $TUXDROID_PATH HKLM "SOFTWARE\Tux Droid\Installation" "Install_Dir"
StrCpy $UNINSTALLERS_SUB_PATH "$TUXDROID_PATH\uninstallers\sub"
@@ -140,6 +142,8 @@
RMDir /r "$TUXDROID_PATH\softwares\smart-server"
Delete "$UNINSTALLERS_SUB_PATH\${UNINSTALLER_EXE}"
+ ; Reveal shortcuts to all users
+ SetShellVarContext all
; Remove shortcuts
Delete "$SMPROGRAMS\Tux Droid\Smart-Core\Smart-Server\Stop.lnk"
Delete "$SMPROGRAMS\Tux Droid\Smart-Core\Smart-Server\Start.lnk"
@@ -260,18 +264,18 @@
Exch ; exchange the top of the stack(default) with
; the second in the stack(parameter to search for)
Exch $R1 ; get the top of the stack(search parameter) into $R1
-
+
;Preserve on the stack the registers used in this function
Push $R2
Push $R3
Push $R4
Push $R5
-
+
Strlen $R2 $R1+2 ; store the length of the search string into R2
-
+
Call GetParameters ; get the command line parameters
Pop $R3 ; store the command line string in R3
-
+
# search for quoted search string
StrCpy $R5 '"' ; later on we want to search for a open quote
Push $R3 ; push the 'search in' string onto the stack
@@ -280,7 +284,7 @@
Pop $R4
StrCpy $R4 $R4 "" 1 ; skip over open quote character, "" means no maxlen
StrCmp $R4 "" "" next ; if we didn't find an empty string go to next
-
+
# search for non-quoted search string
StrCpy $R5 ' ' ; later on we want to search for a space since we
; didn't start with an open quote '"' we shouldn't
@@ -289,7 +293,7 @@
Push '/$R1=' ; search for the non-quoted search string
Call StrStr
Pop $R4
-
+
; $R4 now contains the parameter string starting at the search string,
; if it was found
next:
@@ -315,7 +319,7 @@
; copy only the value into $R0
goto done ; if we are in the parameter retrieval path skip over
; the check for a command line switch
-
+
; See if the parameter was specified as a command line switch, like '/output'
check_for_switch:
Push $R3 ; push the command line back on the stack for searching
@@ -325,7 +329,7 @@
StrCmp $R4 "" done ; if we didn't find anything then use the default
StrCpy $R0 "" ; otherwise copy in an empty string since we found the
; parameter, just didn't find a value
-
+
done:
Pop $R5
Pop $R4
|