Skip to content

Commit

Permalink
Merge branch 'beta'
Browse files Browse the repository at this point in the history
  • Loading branch information
acalcutt committed Feb 15, 2021
2 parents 569bdd0 + 5878426 commit 882c272
Show file tree
Hide file tree
Showing 144 changed files with 42,308 additions and 1,637 deletions.
Binary file removed Installer/VistumblerInstaller.exe
Binary file not shown.
Binary file added Installer/Vistumbler_v10.6.5.exe
Binary file not shown.
Binary file added Installer/nsis-3.04-setup.exe
Binary file not shown.
1,780 changes: 890 additions & 890 deletions Installer/UDFs/Zip.au3 → Installer/old/UDFs/Zip.au3

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#RequireAdmin
#Region ;**** Directives created by AutoIt3Wrapper_GUI ****
#AutoIt3Wrapper_Icon=..\..\VistumblerMDB\Icons\icon.ico
#AutoIt3Wrapper_Res_requestedExecutionLevel=requireAdministrator
#AutoIt3Wrapper_Run_Tidy=y
#EndRegion ;**** Directives created by AutoIt3Wrapper_GUI ****

$TempUninstallEXE = @TempDir & '\vi_uninstall.exe'
FileInstall("vi_uninstall.exe", $TempUninstallEXE, 1)
Run($TempUninstallEXE)
Exit

#RequireAdmin
#Region ;**** Directives created by AutoIt3Wrapper_GUI ****
#AutoIt3Wrapper_Icon=..\..\VistumblerMDB\Icons\icon.ico
#AutoIt3Wrapper_Res_requestedExecutionLevel=requireAdministrator
#AutoIt3Wrapper_Run_Tidy=y
#EndRegion ;**** Directives created by AutoIt3Wrapper_GUI ****

$TempUninstallEXE = @TempDir & '\vi_uninstall.exe'
FileInstall("vi_uninstall.exe", $TempUninstallEXE, 1)
Run($TempUninstallEXE)
Exit

File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
#RequireAdmin
#Region ;**** Directives created by AutoIt3Wrapper_GUI ****
#AutoIt3Wrapper_Icon=..\icon.ico
#AutoIt3Wrapper_Res_requestedExecutionLevel=requireAdministrator
#AutoIt3Wrapper_Run_Tidy=y
#EndRegion ;**** Directives created by AutoIt3Wrapper_GUI ****

Dim $InstallLocation = RegRead("HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Vistumbler", "InstallLocation")
Dim $StartMenu_AllUsers = @ProgramsCommonDir & '\Vistumbler\'
Dim $StartMenu_CurrentUser = @ProgramsDir & '\Vistumbler\'
Dim $Desktop_AllUsers = @DesktopCommonDir & '\Vistumbler.lnk'
Dim $Desktop_CurrentUser = @DesktopDir & '\Vistumbler.lnk'

;Delete Vistumbler files and folders
If FileExists($InstallLocation) Then DirRemove($InstallLocation, 1)
If FileExists($StartMenu_AllUsers) Then DirRemove($StartMenu_AllUsers, 1)
If FileExists($StartMenu_CurrentUser) Then DirRemove($StartMenu_CurrentUser, 1)
If FileExists($Desktop_AllUsers) Then FileDelete($Desktop_AllUsers)
If FileExists($Desktop_CurrentUser) Then FileDelete($Desktop_CurrentUser)

;Delete File Associations
RegDelete("HKCR\.vsz")
RegDelete("HKCR\.vs1")
RegDelete("HKCR\Vistumbler")

;Delete Uninstall Information
RegDelete("HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Vistumbler")

_SelfDelete() ;delete current exe
Exit

Func _SelfDelete($iDelay = 0)
If StringInStr(@ScriptName, ".au3") = 0 Then
Local $sCmdFile
FileDelete(@TempDir & "\scratch.bat")
$sCmdFile = 'ping -n ' & $iDelay & '127.0.0.1 > nul' & @CRLF _
& ':loop' & @CRLF _
& 'del "' & @ScriptFullPath & '"' & @CRLF _
& 'if exist "' & @ScriptFullPath & '" goto loop' & @CRLF _
& 'del ' & @TempDir & '\scratch.bat'
FileWrite(@TempDir & "\scratch.bat", $sCmdFile)
Run(@TempDir & "\scratch.bat", @TempDir, @SW_HIDE)
EndIf
EndFunc ;==>_SelfDelete
#RequireAdmin
#Region ;**** Directives created by AutoIt3Wrapper_GUI ****
#AutoIt3Wrapper_Icon=..\icon.ico
#AutoIt3Wrapper_Res_requestedExecutionLevel=requireAdministrator
#AutoIt3Wrapper_Run_Tidy=y
#EndRegion ;**** Directives created by AutoIt3Wrapper_GUI ****

Dim $InstallLocation = RegRead("HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Vistumbler", "InstallLocation")
Dim $StartMenu_AllUsers = @ProgramsCommonDir & '\Vistumbler\'
Dim $StartMenu_CurrentUser = @ProgramsDir & '\Vistumbler\'
Dim $Desktop_AllUsers = @DesktopCommonDir & '\Vistumbler.lnk'
Dim $Desktop_CurrentUser = @DesktopDir & '\Vistumbler.lnk'

;Delete Vistumbler files and folders
If FileExists($InstallLocation) Then DirRemove($InstallLocation, 1)
If FileExists($StartMenu_AllUsers) Then DirRemove($StartMenu_AllUsers, 1)
If FileExists($StartMenu_CurrentUser) Then DirRemove($StartMenu_CurrentUser, 1)
If FileExists($Desktop_AllUsers) Then FileDelete($Desktop_AllUsers)
If FileExists($Desktop_CurrentUser) Then FileDelete($Desktop_CurrentUser)

;Delete File Associations
RegDelete("HKCR\.vsz")
RegDelete("HKCR\.vs1")
RegDelete("HKCR\Vistumbler")

;Delete Uninstall Information
RegDelete("HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Vistumbler")

_SelfDelete() ;delete current exe
Exit

Func _SelfDelete($iDelay = 0)
If StringInStr(@ScriptName, ".au3") = 0 Then
Local $sCmdFile
FileDelete(@TempDir & "\scratch.bat")
$sCmdFile = 'ping -n ' & $iDelay & '127.0.0.1 > nul' & @CRLF _
& ':loop' & @CRLF _
& 'del "' & @ScriptFullPath & '"' & @CRLF _
& 'if exist "' & @ScriptFullPath & '" goto loop' & @CRLF _
& 'del ' & @TempDir & '\scratch.bat'
FileWrite(@TempDir & "\scratch.bat", $sCmdFile)
Run(@TempDir & "\scratch.bat", @TempDir, @SW_HIDE)
EndIf
EndFunc ;==>_SelfDelete
File renamed without changes.
Loading

0 comments on commit 882c272

Please sign in to comment.