Merge pull request #4830 from hpwamr/Mui_Beta

MUI - Remove duplicate file (with Other\Source)
This commit is contained in:
Pairi Daiza 2023-05-26 09:15:38 +02:00 committed by GitHub
commit 289bd9cdb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 25 deletions

2
.gitignore vendored
View File

@ -53,7 +53,7 @@ Thumbs.db
/np3portableapp/Signing_for*.cmd
/np3portableapp/Signing_log*.txt
/np3portableapp/Notepad3Portable/Data
/np3portableapp/Notepad3Portable/Notepad3Portable.exe
/np3portableapp/Notepad3Portable/Notepad3Portable.*
/np3portableapp/Notepad3Portable/App/AppInfo/appinfo.ini
/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini
/np3portableapp/Notepad3Portable/App/DefaultData/settings

View File

@ -1,24 +0,0 @@
@echo off
:: Thanks to "Wilenty" for this "Additional Notepad3Portable.cmd Launcher".
If not exist "%~dp0\Data\settings\" (
If exist "%~dp0\App\DefaultData\settings\" (
mkdir "%~dp0\Data\settings"
copy /y "%~dp0\App\DefaultData\settings" "%~dp0\Data\settings" >nul 2>&1
For /f "delims=" %%W in (' dir /b /a:d "%~dp0\App\DefaultData\settings" ') do mkdir "%~dp0\Data\settings\%%~nW"&&copy /y "%~dp0\App\DefaultData\settings\%%~W" "%~dp0\Data\settings\%%~nW" >nul 2>&1
)
)
set ErrorLevel=-1
If exist "%~dp0\Data\settings\" (
set "NOTEPAD3_PORTABLE_SETTINGS=%~dp0\Data\settings"
If exist "%WinDir%\SysNative" (
start "Notepad3 Portable" /b "%~dp0\App\Notepad3\x64\Notepad3.exe" %*
) else (
start "Notepad3 Portable" /b "%~dp0\App\Notepad3\x86\Notepad3.exe" %*
)
)
exit /b %ErrorLevel%