mirror of
				https://github.com/chibicitiberiu/rainmeter-studio.git
				synced 2024-02-24 04:33:31 +00:00 
			
		
		
		
	Installer: Added support for 3cae4f7
				
					
				
			This commit is contained in:
		@@ -777,7 +777,10 @@ SkipIniMove:
 | 
				
			|||||||
	${If} $InstallPortable <> 1
 | 
						${If} $InstallPortable <> 1
 | 
				
			||||||
		CreateDirectory "$INSTDIR\Defaults"
 | 
							CreateDirectory "$INSTDIR\Defaults"
 | 
				
			||||||
		Rename "$INSTDIR\Skins" "$INSTDIR\Defaults\Skins"
 | 
							Rename "$INSTDIR\Skins" "$INSTDIR\Defaults\Skins"
 | 
				
			||||||
		Rename "$INSTDIR\Themes" "$INSTDIR\Defaults\Themes"
 | 
					
 | 
				
			||||||
 | 
							Rename "$INSTDIR\Themes" "$INSTDIR\Defaults\Layouts"
 | 
				
			||||||
 | 
							Rename "$INSTDIR\Defaults\Themes" "$INSTDIR\Defaults\Layouts"
 | 
				
			||||||
 | 
							${Locate} "$INSTDIR\Defaults\Layouts" "/L=F /M=Rainmeter.thm /G=1" "RenameToRainmeterIni"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		${If} ${FileExists} "$INSTDIR\Addons\Backup"
 | 
							${If} ${FileExists} "$INSTDIR\Addons\Backup"
 | 
				
			||||||
		${OrIf} ${FileExists} "$INSTDIR\Plugins\Backup"
 | 
							${OrIf} ${FileExists} "$INSTDIR\Plugins\Backup"
 | 
				
			||||||
@@ -806,7 +809,7 @@ SkipIniMove:
 | 
				
			|||||||
	Delete "$INSTDIR\Skins\*.txt"
 | 
						Delete "$INSTDIR\Skins\*.txt"
 | 
				
			||||||
	File /r "..\Skins\*.*"
 | 
						File /r "..\Skins\*.*"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	SetOutPath "$INSTDIR\Defaults\Themes"
 | 
						SetOutPath "$INSTDIR\Defaults\Layouts"
 | 
				
			||||||
	File /r "..\Themes\*.*"
 | 
						File /r "..\Themes\*.*"
 | 
				
			||||||
!endif
 | 
					!endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -880,7 +883,7 @@ SkipIniMove:
 | 
				
			|||||||
		WriteUninstaller "$INSTDIR\uninst.exe"
 | 
							WriteUninstaller "$INSTDIR\uninst.exe"
 | 
				
			||||||
	${Else}
 | 
						${Else}
 | 
				
			||||||
		${IfNot} ${FileExists} "Rainmeter.ini"
 | 
							${IfNot} ${FileExists} "Rainmeter.ini"
 | 
				
			||||||
			CopyFiles /SILENT "$INSTDIR\Themes\illustro default\Rainmeter.thm" "$INSTDIR\Rainmeter.ini"
 | 
								CopyFiles /SILENT "$INSTDIR\Layouts\illustro default\Rainmeter.ini" "$INSTDIR\Rainmeter.ini"
 | 
				
			||||||
		${EndIf}
 | 
							${EndIf}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		WriteINIStr "$INSTDIR\Rainmeter.ini" "Rainmeter" "Language" "$LANGUAGE"
 | 
							WriteINIStr "$INSTDIR\Rainmeter.ini" "Rainmeter" "Language" "$LANGUAGE"
 | 
				
			||||||
@@ -896,6 +899,16 @@ Function CopyIniToAppData
 | 
				
			|||||||
	${EndIf}
 | 
						${EndIf}
 | 
				
			||||||
FunctionEnd
 | 
					FunctionEnd
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Function RenameToRainmeterIni
 | 
				
			||||||
 | 
						${If} ${FileExists} "$R8\Rainmeter.ini"
 | 
				
			||||||
 | 
							Delete "$R8\Rainmeter.thm"
 | 
				
			||||||
 | 
						${Else}
 | 
				
			||||||
 | 
							Rename "$R9" "$R8\Rainmeter.ini"
 | 
				
			||||||
 | 
						${EndIf}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						Push $0
 | 
				
			||||||
 | 
					FunctionEnd
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Function MoveNonDefaultPlugins
 | 
					Function MoveNonDefaultPlugins
 | 
				
			||||||
	${If} $R7 != "AdvancedCPU.dll"
 | 
						${If} $R7 != "AdvancedCPU.dll"
 | 
				
			||||||
	${AndIf} $R7 != "CoreTemp.dll"
 | 
						${AndIf} $R7 != "CoreTemp.dll"
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user