distribution/windows/cron.ahk distribution/windows/cron.exe @@ -242,6 +242,29 @@ Function nsDialogsPageLeave !insertmacro ReplaceInFile "c:\prey\config" "smtp_password" "smtp_password='$R0'" ${EndIf} + ${ConfigRead} "c:\prey\config" "post_method=" $0 + ${If} $0 == "'http'" + GetDlgItem $1 $HWNDPARENT 1 + SendMessage $1 ${WM_SETTEXT} 0 "STR:Checking..." + ${NSD_GetText} $API_KEY $3 + ${NSD_GetText} $DEVICE_KEY $4 + # Error Code = $0. Output = $1. + nsExec::ExecToStack '"c:\prey\bin\curl.exe" -s -X PUT http://control.preyproject.com/devices/$4.xml -d api_key=$3&device[synced]=1' + Pop $0 + Pop $1 + ${If} $1 != "OK" + MessageBox MB_OK "Synchronization failed. Please make sure your API and Device keys are set up correctly, and we have an active Internet connection available." + GetDlgItem $1 $HWNDPARENT 1 + SendMessage $1 ${WM_SETTEXT} 0 "STR:Apply" + Abort + ${Else} + GetDlgItem $1 $HWNDPARENT 1 + SendMessage $1 ${WM_SETTEXT} 0 "STR:OK!" + ${EndIf} + ${EndIf} + + MessageBox MB_OK "Configuration OK! $\r$\nThanks for installing Prey." + FunctionEnd Section distribution/windows/configurator.nsi @@ -15,7 +15,7 @@ ;Name and file Name "Prey" - OutFile "prey-installer-0.3.1-win32.exe" + OutFile "prey-installer-0.3.3-win32.exe" ;Default installation folder ;InstallDir "$LOCALAPPDATA\Prey" @@ -88,6 +88,7 @@ Section "Prey" PreySection ; windows specific stuff File /r /x .* cron.exe File /r /x .* prey-config.exe + File /r /x .* delay File /r /x .* etc SetOutPath "$INSTDIR\bin" @@ -126,14 +127,17 @@ Section "Prey" PreySection ;Create shortcuts CreateDirectory "$SMPROGRAMS\$StartMenuFolder" ; CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Prey.lnk" "$INSTDIR\prey.bat" - ; CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Configure Prey.lnk" "$PROGRAMFILES\Windows NT\Accessories\wordpad.exe" "$INSTDIR\config" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Configure Prey.lnk" "$INSTDIR\prey-config.exe" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe" !insertmacro MUI_STARTMENU_WRITE_END + ; create the registry and start the program + WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" 'Cron for Prey Laptop Tracker' '$INSTDIR\cron.exe' + Exec '"$INSTDIR\cron.exe"' + ; add scheduled task - nsExec::Exec '"schtasks.exe" -create -ru "System" -sc MINUTE -mo 10 -tn "Prey" -tr "$INSTDIR\prey.bat"' + ; nsExec::Exec '"schtasks.exe" -create -ru "System" -sc MINUTE -mo 10 -tn "Prey" -tr "$INSTDIR\prey.bat"' SectionEnd @@ -180,8 +184,11 @@ Section "Uninstall" RMDir "$SMPROGRAMS\$StartMenuFolder" DeleteRegKey /ifempty HKCU "Software\Prey" + DeleteRegValue HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" 'Cron for Prey Laptop Tracker' + + Exec '"taskkill.exe" /IM "cron.exe"' ; delete prey scheduled task - nsExec::Exec '"schtasks.exe" -delete -f -tn "Prey"' + ; nsExec::Exec '"schtasks.exe" -delete -f -tn "Prey"' SectionEnd distribution/windows/installer.nsi @@ -15,12 +15,12 @@ function try_to_connect { } function get_current_delay { - schtasks.exe -query -fo LIST -v | egrep "TaskName|Repeat" | grep -A1 "Prey" | grep -v "Prey" | sed 's/[^0-9]//g' + cat $base_path/delay } function update_execution_delay { - schtasks.exe -delete -f -tn "Prey" 2> /dev/null - schtasks.exe -create -ru "System" -sc MINUTE -mo $delay -tn "Prey" -tr "c:\Prey\prey.bat" 2> /dev/null + $delay_in_miliseconds=$$(($delay*60*1000)) + echo "$delay_in_miliseconds" > $base_path/delay } # module de/activation functions platform/windows @@ -5,7 +5,7 @@ # License: GPLv3 #################################################################### -version='0.3.1' +version='0.3.3' base_path=`dirname $0` start_time=`date +"%F %T"` os=`uname | sed "y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/"` prey.sh c0929aaa59017a9cc4e9db31833ff87a6f6b05b6 31613d47203c785cbcc4263274a9f6fe78176929 Tomas Pollak tomaspollak@gmail.com http://github.com/tomas/prey/commit/d4c8009f9e46df0b65bd181b2547354cdb081a23 d4c8009f9e46df0b65bd181b2547354cdb081a23 2009-10-09T11:40:25-07:00 2009-10-09T11:40:25-07:00 Added cron for Prey in Windows, with script. Modified installer accordingly, and also checker for configuration too b1f8a583aee1dc6de5acba1805c8cf69b60204d8 Tomas Pollak tomaspollak@gmail.com