Simplify/move new user logic to Toolbar.ahk

fincs · May 11, 2022 · 8613a7a · 8613a7a
1 parent 9b5af17
commit 8613a7a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 26 deletions.
diff --git a/source/newuser/user.ahk.api b/source/newuser/user.ahk.api
diff --git a/source/toolbar/Toolbar.ahk b/source/toolbar/Toolbar.ahk
@@ -112,8 +112,21 @@ if SciTEVersion && (SciTEVersion != CurrentSciTEVersion)
 
 if !IsPortable && (!FileExist(LocalPropsPath) || !SciTEVersion)
 {
+	; Rename the old SciTE folder
+	IfExist, %LocalSciTEPath%
+	{
+		FileMoveDir, %LocalSciTEPath%, %LocalSciTEPath%%A_TickCount%, R
+		if ErrorLevel
+		{
+			MsgBox, 16, SciTE4AutoHotkey Toolbar, Could not safely rename old SciTE settings folder!
+			ExitApp
+		}
+	}
+
 	; Create the SciTE user folder
-	RunWait, "%A_AhkPath%" "%SciTEDir%\tools\NewUser.ahk"
+	FileCreateDir, %A_MyDocuments%\AutoHotkey\Lib ; ensure dir structure exists
+	FileCopyDir, %SciTEDir%\newuser, %LocalSciTEPath%
+
 	FileDelete, %LocalSciTEPath%\$VER
 	FileAppend, %CurrentSciTEVersion%, %LocalSciTEPath%\$VER
 

diff --git a/source/tools/NewUser.ahk b/source/tools/NewUser.ahk