Skip to content

Commit a9ab475

Browse files
OSPanelOSPanel
committed
Update gen files
1 parent 0f7b33b commit a9ab475

3 files changed

Lines changed: 52 additions & 52 deletions

File tree

‎generate/gendb.bat‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set "TMP_ROOT=%~dp0.."
77
for %%I in ("%TMP_ROOT%") do set "TMP_ROOT=%%~fI"
88
set "OSP_ROOT_DIR=%TMP_ROOT%"
99
set "OSP_ROOT_DIR_UNIX=%TMP_ROOT:\=/%"
10-
chcp 65001 > nul
10+
chcp 65001
1111
TITLE DB Generator
1212
call "%OSP_ROOT_DIR%\generate\genmariadb.bat"
1313
call "%OSP_ROOT_DIR%\generate\genmysql.bat"
@@ -25,8 +25,8 @@ goto end
2525
:posgresql
2626
setlocal
2727
powershell -NoLogo -NoProfile -Command ^
28-
"try { (Get-Content '%OSP_ROOT_DIR%\generate\config\PostgreSQL\postgresql.conf') -replace '{root_dir}', '%OSP_ROOT_DIR%' -replace '{module_name}', '%1' | Set-Content '%OSP_ROOT_DIR%\modules\%1\ospanel_data\default_data\postgresql.conf'; exit 0 } catch { exit 1 }" >nul 2>&1
29-
copy /Y "%OSP_ROOT_DIR%\generate\config\PostgreSQL\pg_hba.conf" "%OSP_ROOT_DIR%\modules\%1\ospanel_data\default_data\pg_hba.conf" >nul 2>&1
28+
"try { (Get-Content '%OSP_ROOT_DIR%\generate\config\PostgreSQL\postgresql.conf') -replace '{root_dir}', '%OSP_ROOT_DIR%' -replace '{module_name}', '%1' | Set-Content '%OSP_ROOT_DIR%\modules\%1\ospanel_data\default_data\postgresql.conf'; exit 0 } catch { exit 1 }"
29+
copy /Y "%OSP_ROOT_DIR%\generate\config\PostgreSQL\pg_hba.conf" "%OSP_ROOT_DIR%\modules\%1\ospanel_data\default_data\pg_hba.conf"
3030
set "PGDATA=%OSP_ROOT_DIR%\modules\%1\ospanel_data\default_data"
3131
set "PGCLIENTENCODING=utf-8"
3232
set "PGHOST=127.0.0.1"
@@ -38,13 +38,13 @@ set "PGTZ={time_zone}"
3838
set "PGUSER=postgres"
3939
set "TEMP=%OSP_ROOT_DIR%\modules\%1\temp"
4040
set "TMP=%OSP_ROOT_DIR%\modules\%1\temp"
41-
rd "%TMP%" /s /q 2>nul
42-
rd "%PGDATA%" /s /q 2>nul
43-
mkdir "%TMP%" 2>nul
44-
mkdir "%PGDATA%" 2>nul
41+
rd "%TMP%" /s /q
42+
rd "%PGDATA%" /s /q
43+
mkdir "%TMP%"
44+
mkdir "%PGDATA%"
4545
%OSP_ROOT_DIR%\modules\%1\bin\initdb.exe --data-checksums --no-locale -U postgres --encoding=UTF8 -D "%PGDATA%"
4646
del "%PGDATA%\pg_hba.conf" "%PGDATA%\postgresql.conf"
47-
rd /s /q "%TMP%" 2>nul
47+
rd /s /q "%TMP%"
4848
endlocal
4949
exit /b 0
5050
:end

‎generate/genmariadb.bat‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set "OSP_ROOT_DIR=%TMP_ROOT%"
1212
set "OSP_ROOT_DIR_UNIX=%TMP_ROOT:\=/%"
1313

1414
:: Set UTF-8 encoding
15-
chcp 65001 > nul
15+
chcp 65001
1616

1717
echo.
1818
echo ================================================================================
@@ -68,14 +68,14 @@ if not exist "%db_dir%" (
6868

6969
echo 🧹 Cleaning old data and configuration...
7070
if exist "%data_dir%" (
71-
rd /s /q "%data_dir%" 2>nul
71+
rd /s /q "%data_dir%"
7272
if exist "%data_dir%" (
7373
echo ⚠️ WARNING: Could not completely remove old data directory
7474
)
7575
)
7676

7777
:: Clean old configuration files
78-
del "%db_dir%\*.ini" /q >nul 2>&1
78+
del "%db_dir%\*.ini" /q
7979

8080
:: Set environment variables
8181
echo 🔧 Setting up environment...
@@ -97,8 +97,8 @@ if !errorlevel! neq 0 (
9797
:: Initialize database
9898
echo 💾 Installing database...
9999
cd /d "%db_dir%"
100-
copy my.ini my-default.ini >nul 2>&1
101-
copy my.ini my_print_defaults.ini >nul 2>&1
100+
copy my.ini my-default.ini
101+
copy my.ini my_print_defaults.ini
102102

103103
bin\mysql_install_db.exe --datadir="%data_dir%" --allow-remote-root-access -o
104104
if !errorlevel! neq 0 (
@@ -107,10 +107,10 @@ if !errorlevel! neq 0 (
107107
)
108108

109109
echo ⏳ Waiting for installation to complete...
110-
timeout /t 3 /nobreak > nul
110+
timeout /t 3 /nobreak
111111

112112
:: Clean up temporary ini files
113-
del "*.ini" /q >nul 2>&1
113+
del "*.ini" /q
114114

115115
:: Configure my.ini again for startup
116116
call :configure_db_ini "%db_dir%" "%VERSION%"
@@ -124,11 +124,11 @@ call :configure_timezone "%db_dir%" "%VERSION%"
124124
if !errorlevel! neq 0 exit /b 1
125125

126126
echo ⏳ Waiting for timezone configuration to complete...
127-
timeout /t 3 /nobreak > nul
127+
timeout /t 3 /nobreak
128128

129129
:: Execute main installation SQL
130130
echo 🔧 Running main installation script...
131-
copy /Y "%OSP_ROOT_DIR%\generate\config\mariadb\my_configured.ini" "%db_dir%\my.ini" >nul
131+
copy /Y "%OSP_ROOT_DIR%\generate\config\mariadb\my_configured.ini" "%db_dir%\my.ini"
132132
call :replace_placeholders "%db_dir%\my.ini" "%OSP_ROOT_DIR_UNIX%" "%VERSION%"
133133
call :execute_installation_sql "%db_dir%" "%VERSION%"
134134
if !errorlevel! neq 0 exit /b 1
@@ -166,7 +166,7 @@ exit /b 0
166166
set "data_dir=%~1"
167167
for %%D in ("%data_dir%") do (
168168
if not exist "%%D" (
169-
mkdir "%%D" 2>nul
169+
mkdir "%%D"
170170
if not exist "%%D" (
171171
echo ❌ ERROR: Failed to create directory %%D
172172
exit /b 1
@@ -178,7 +178,7 @@ exit /b 0
178178
:configure_db_ini
179179
set "db_dir=%~1"
180180
set "version=%~2"
181-
copy /Y "%OSP_ROOT_DIR%\generate\config\mariadb\my.ini" "%db_dir%\my.ini" >nul 2>&1
181+
copy /Y "%OSP_ROOT_DIR%\generate\config\mariadb\my.ini" "%db_dir%\my.ini"
182182
if !errorlevel! neq 0 (
183183
echo ❌ ERROR: Failed to copy my.ini template
184184
exit /b 1
@@ -188,7 +188,7 @@ exit /b 0
188188

189189
:replace_placeholders
190190
powershell -NoLogo -NoProfile -Command ^
191-
"try { (Get-Content '%~1') -replace '{root_dir}', '%~2' -replace '{module_name}', '%~3' | Set-Content '%~1'; exit 0 } catch { exit 1 }" >nul 2>&1
191+
"try { (Get-Content '%~1') -replace '{root_dir}', '%~2' -replace '{module_name}', '%~3' | Set-Content '%~1'; exit 0 } catch { exit 1 }"
192192
exit /b %errorlevel%
193193

194194
:get_db_startup_params
@@ -214,7 +214,7 @@ echo 🚀 Starting database server for %operation%...
214214
start "MySQL_%version%_%operation%" bin\mysqld.exe --defaults-file="%db_dir%\my.ini" %DB_STARTUP_PARAMS%
215215

216216
echo ⏳ Waiting for server to start...
217-
timeout /t 5 /nobreak > nul
217+
timeout /t 5 /nobreakl
218218

219219
if "%sql_file%" neq "" (
220220
echo 📜 Executing %operation% SQL...
@@ -225,8 +225,8 @@ if "%sql_file%" neq "" (
225225
)
226226

227227
echo 🛑 Shutting down database server...
228-
bin\mysqladmin.exe --protocol=PIPE --socket=%version% --host="" -u root shutdown >nul 2>&1
229-
timeout /t 5 /nobreak > nul
228+
bin\mysqladmin.exe --protocol=PIPE --socket=%version% --host="" -u root shutdown
229+
timeout /t 5 /nobreak
230230

231231
if !sql_result! neq 0 (
232232
echo ❌ ERROR: %operation% execution failed
@@ -261,8 +261,8 @@ exit /b %errorlevel%
261261

262262
:final_cleanup
263263
set "db_dir=%~1"
264-
if exist "%db_dir%\temp" rd /s /q "%db_dir%\temp" 2>nul
265-
del "%db_dir%\ospanel_data\default_data\*.ini" /q >nul 2>&1
266-
del "%db_dir%\ospanel_data\default_data\*.err" /q >nul 2>&1
267-
del "%db_dir%\*.ini" /q >nul 2>&1
264+
if exist "%db_dir%\temp" rd /s /q "%db_dir%\temp"
265+
del "%db_dir%\ospanel_data\default_data\*.ini" /q
266+
del "%db_dir%\ospanel_data\default_data\*.err" /q
267+
del "%db_dir%\*.ini" /q
268268
exit /b 0

‎generate/genmysql.bat‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set "OSP_ROOT_DIR=%TMP_ROOT%"
1212
set "OSP_ROOT_DIR_UNIX=%TMP_ROOT:\=/%"
1313

1414
:: Set UTF-8 encoding
15-
chcp 65001 > nul
15+
chcp 65001
1616

1717
echo.
1818
echo ================================================================================
@@ -69,14 +69,14 @@ if not exist "%db_dir%" (
6969

7070
echo 🧹 Cleaning old data and configuration...
7171
if exist "%data_dir%" (
72-
rd /s /q "%data_dir%" 2>nul
72+
rd /s /q "%data_dir%"
7373
if exist "%data_dir%" (
7474
echo ⚠️ WARNING: Could not completely remove old data directory
7575
)
7676
)
7777

7878
:: Clean old configuration files
79-
del "%db_dir%\*.ini" /q >nul 2>&1
79+
del "%db_dir%\*.ini" /q
8080

8181
:: Set environment variables
8282
echo 🔧 Setting up environment...
@@ -98,17 +98,17 @@ if !errorlevel! neq 0 (
9898
:: Initialize database
9999
echo 💾 Installing database...
100100
cd /d "%db_dir%"
101-
copy my.ini my-default.ini >nul 2>&1
102-
copy my.ini my_print_defaults.ini >nul 2>&1
101+
copy my.ini my-default.ini
102+
copy my.ini my_print_defaults.ini
103103

104104
call :initialize_database "%VERSION%" "%db_dir%" "%data_dir%"
105105
if !errorlevel! neq 0 exit /b 1
106106

107107
echo ⏳ Waiting for installation to complete...
108-
timeout /t 3 /nobreak > nul
108+
timeout /t 3 /nobreak
109109

110110
:: Clean up temporary ini files
111-
del "*.ini" /q >nul 2>&1
111+
del "*.ini" /q
112112

113113
:: Configure my.ini again for startup
114114
call :configure_db_ini "%db_dir%" "%VERSION%"
@@ -126,11 +126,11 @@ call :configure_timezone "%db_dir%" "%VERSION%"
126126
if !errorlevel! neq 0 exit /b 1
127127

128128
echo ⏳ Waiting for timezone configuration to complete...
129-
timeout /t 3 /nobreak > nul
129+
timeout /t 3 /nobreak
130130

131131
:: Execute main installation SQL
132132
echo 🔧 Running main installation script...
133-
copy /Y "%OSP_ROOT_DIR%\generate\config\%VERSION%\my_configured.ini" "%db_dir%\my.ini" >nul
133+
copy /Y "%OSP_ROOT_DIR%\generate\config\%VERSION%\my_configured.ini" "%db_dir%\my.ini"
134134
call :replace_placeholders "%db_dir%\my.ini" "%OSP_ROOT_DIR_UNIX%" "%VERSION%"
135135
call :execute_installation_sql "%db_dir%" "%VERSION%"
136136
if !errorlevel! neq 0 exit /b 1
@@ -168,7 +168,7 @@ exit /b 0
168168
set "data_dir=%~1"
169169
for %%D in ("%data_dir%") do (
170170
if not exist "%%D" (
171-
mkdir "%%D" 2>nul
171+
mkdir "%%D"
172172
if not exist "%%D" (
173173
echo ❌ ERROR: Failed to create directory %%D
174174
exit /b 1
@@ -180,7 +180,7 @@ exit /b 0
180180
:configure_db_ini
181181
set "db_dir=%~1"
182182
set "version=%~2"
183-
copy /Y "%OSP_ROOT_DIR%\generate\config\%version%\my.ini" "%db_dir%\my.ini" >nul 2>&1
183+
copy /Y "%OSP_ROOT_DIR%\generate\config\%version%\my.ini" "%db_dir%\my.ini"
184184
if !errorlevel! neq 0 (
185185
echo ❌ ERROR: Failed to copy my.ini template
186186
exit /b 1
@@ -190,7 +190,7 @@ exit /b 0
190190

191191
:replace_placeholders
192192
powershell -NoLogo -NoProfile -Command ^
193-
"try { (Get-Content '%~1') -replace '{root_dir}', '%~2' -replace '{module_name}', '%~3' | Set-Content '%~1'; exit 0 } catch { exit 1 }" >nul 2>&1
193+
"try { (Get-Content '%~1') -replace '{root_dir}', '%~2' -replace '{module_name}', '%~3' | Set-Content '%~1'; exit 0 } catch { exit 1 }"
194194
exit /b %errorlevel%
195195

196196
:get_db_startup_params
@@ -234,7 +234,7 @@ echo 🚀 Starting database server for %operation%...
234234
start "MySQL_%version%_%operation%" bin\mysqld.exe --defaults-file="%db_dir%\my.ini" %DB_STARTUP_PARAMS%
235235

236236
echo ⏳ Waiting for server to start...
237-
timeout /t 5 /nobreak > nul
237+
timeout /t 5 /nobreak
238238

239239
if "%sql_file%" neq "" (
240240
echo 📜 Executing %operation% SQL...
@@ -245,8 +245,8 @@ if "%sql_file%" neq "" (
245245
)
246246

247247
echo 🛑 Shutting down database server...
248-
bin\mysqladmin.exe%db_pipe% --socket=%version% --host="" -u root shutdown >nul 2>&1
249-
timeout /t 5 /nobreak > nul
248+
bin\mysqladmin.exe%db_pipe% --socket=%version% --host="" -u root shutdown
249+
timeout /t 5 /nobreak
250250

251251
if !sql_result! neq 0 (
252252
echo ❌ ERROR: %operation% execution failed
@@ -264,15 +264,15 @@ echo 🚀 Starting database server for MySQL X Plugin installation...
264264
start "MySQL_%version%_mysqlx" bin\mysqld.exe --defaults-file="%db_dir%\my.ini" %DB_STARTUP_PARAMS%
265265

266266
echo ⏳ Waiting for server to start...
267-
timeout /t 5 /nobreak > nul
267+
timeout /t 5 /nobreak
268268

269269
echo 🔌 Installing MySQL X Plugin...
270270
bin\mysql.exe --defaults-file="%db_dir%\my.ini"%db_pipe% --socket=%version% --host="" -u root mysql -e "INSTALL PLUGIN mysqlx SONAME 'mysqlx.dll';"
271271
set "plugin_result=!errorlevel!"
272272

273273
echo 🛑 Shutting down database server...
274-
bin\mysqladmin.exe%db_pipe% --socket=%version% --host="" -u root shutdown >nul 2>&1
275-
timeout /t 3 /nobreak > nul
274+
bin\mysqladmin.exe%db_pipe% --socket=%version% --host="" -u root shutdown
275+
timeout /t 3 /nobreak
276276

277277
if !plugin_result! neq 0 (
278278
echo ⚠️ WARNING: MySQL X Plugin installation failed
@@ -294,14 +294,14 @@ call :get_db_startup_params "%version%"
294294

295295
start "MySQL_%version%_timezone" bin\mysqld.exe --defaults-file="%db_dir%\my.ini" %DB_STARTUP_PARAMS%
296296

297-
timeout /t 5 /nobreak > nul
297+
timeout /t 5 /nobreak
298298

299299
bin\mysql.exe --defaults-file="%db_dir%\my.ini"%db_pipe% --socket=%version% --host="" -u root mysql < "%OSP_ROOT_DIR%\generate\setup\timezone_posix.sql"
300300
set "timezone_result=!errorlevel!"
301301

302302
echo 🛑 Shutting down database server...
303-
bin\mysqladmin.exe%db_pipe% --socket=%version% --host="" -u root shutdown >nul 2>&1
304-
timeout /t 3 /nobreak > nul
303+
bin\mysqladmin.exe%db_pipe% --socket=%version% --host="" -u root shutdown
304+
timeout /t 3 /nobreak
305305

306306
if !timezone_result! neq 0 (
307307
echo ❌ ERROR: Timezone configuration failed
@@ -318,8 +318,8 @@ exit /b %errorlevel%
318318

319319
:final_cleanup
320320
set "db_dir=%~1"
321-
if exist "%db_dir%\temp" rd /s /q "%db_dir%\temp" 2>nul
322-
del "%db_dir%\ospanel_data\default_data\*.ini" /q >nul 2>&1
323-
del "%db_dir%\ospanel_data\default_data\*.err" /q >nul 2>&1
324-
del "%db_dir%\*.ini" /q >nul 2>&1
321+
if exist "%db_dir%\temp" rd /s /q "%db_dir%\temp"
322+
del "%db_dir%\ospanel_data\default_data\*.ini" /q
323+
del "%db_dir%\ospanel_data\default_data\*.err" /q
324+
del "%db_dir%\*.ini" /q
325325
exit /b 0

0 commit comments

Comments
 (0)