diff --git a/WAPT/control b/WAPT/control index 5f432cf..acdc22a 100644 --- a/WAPT/control +++ b/WAPT/control @@ -1,5 +1,5 @@ package : eht-openvpn-setup -version : 1-5 +version : 1-6 architecture : x64 section : base priority : optional @@ -29,7 +29,7 @@ editor : Ehtrace keywords : openvpn,vpn,private,network licence : MIT homepage : https://www.ehtrace.com -package_uuid : 66ea8d66-fdf6-48eb-8d7b-1e038060e3c6 +package_uuid : ffd899c9-6076-4525-8e14-31c7ca132cbe valid_from : valid_until : forced_install_on : @@ -39,6 +39,6 @@ max_os_version : icon_sha256sum : 18848bc4babf25a75264225d9fd7251453186e19518d4426680a8d93b3c81cdb signer : dbd signer_fingerprint: e9156ec73f1ea6b50f33e0d9f580e8ae56db147100894bb5d2d4648a46f07ed1 -signature : W0+zGZaZtEXHaZS1X71vm5bI9OiZLj5ta0TkI1aZkXXTss0bYYaD+49YxPzDpDtHaWzA303zntIlmfctu+7pbIf3RaHh0iNHcmzpqSp0LhH0PhiScodPQ8bex4hkmg1aw14Q5Gg2u0M+5v4ot+vb5J/raldNVbci5ria2OvTFM0Wk3vjVUCqsj7YoV3C5zCrERVRYEgQC7mq7GknmRniGwggM3fe+POCvZ+11S7aa3rxCCdYTD0UJfTprZzLZ6bqUerPhKKDRYXkofB4+HvaP3M57XN0WZgq1S2dXXYPfc3m8M83Tw+z6cnAJfH8V8Dq4NQ6ZS5OhasaA6+A4qP/MQ== -signature_date : 2023-03-29T16:20:59.164549 +signature : wuzcQpYoqESHyq6w6X72+t2YMW6hTFfSQWczDvBLWUXCgRVFRQGq2OI7wgyXJh4wBiSpC2EXbho1D3U1nI7aG1sgOfMXYNr/tdQU18+qNcPHHEiSk1uXeyM0jeFCn7UG8i92E8jDJ5ZT21hEjJjSHUXKcTaYtLnc90RplbFpZC1x9QOW8rJCvpFl6feaHMS3OeRIU0Al1kcpybdJV/zrr4D/kwqjbEUxhY460Nby9ituTQ3kEHXxETVpfq2XRi5WIKxNB8Jy46DCsYThOCTFRPibOm4sW+l4GyLgKJaxNONOwthu7nOfc6QNsNfhmti4OxKJIS2eZrGA/4Teqm1tPw== +signature_date : 2023-07-03T12:04:58.892075 signed_attributes : package,version,architecture,section,priority,name,categories,maintainer,description,depends,conflicts,maturity,locale,target_os,min_wapt_version,sources,installed_size,impacted_process,description_fr,description_pl,description_de,description_es,description_pt,description_it,description_nl,description_ru,audit_schedule,editor,keywords,licence,homepage,package_uuid,valid_from,valid_until,forced_install_on,changelog,min_os_version,max_os_version,icon_sha256sum,signer,signer_fingerprint,signature_date,signed_attributes \ No newline at end of file diff --git a/WAPT/wapt.psproj b/WAPT/wapt.psproj index 42a4af8..31fd757 100644 --- a/WAPT/wapt.psproj +++ b/WAPT/wapt.psproj @@ -1,5 +1,5 @@ [PyScripter] -Version=3.4.2.0 +Version=3.6.4.0 [Project] ClassName=TProjectRootNode @@ -23,18 +23,34 @@ FileName=C:\Program Files (x86)\wapt\setuphelpers.py [Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2] ClassName=TProjectFileNode -FileName=C:\Program Files (x86)\wapt\wapt-get.py +FileName=C:\Program Files (x86)\wapt\setuphelpers_linux.py [Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3] ClassName=TProjectFileNode -FileName=C:\Program Files (x86)\wapt\wapt-get.ini +FileName=C:\Program Files (x86)\wapt\setuphelpers_macos.py [Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4] ClassName=TProjectFileNode +FileName=C:\Program Files (x86)\wapt\setuphelpers_unix.py + +[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node5] +ClassName=TProjectFileNode +FileName=C:\Program Files (x86)\wapt\setuphelpers_windows.py + +[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node6] +ClassName=TProjectFileNode +FileName=C:\Program Files (x86)\wapt\wapt-get.ini + +[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node7] +ClassName=TProjectFileNode +FileName=C:\Program Files (x86)\wapt\wapt-get.py + +[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node8] +ClassName=TProjectFileNode FileName=C:\Program Files (x86)\wapt\waptpackage.py [Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes] -Count=5 +Count=9 [Project\ChildNodes\Node0\ChildNodes\Node1] ClassName=TProjectFileNode @@ -56,10 +72,11 @@ ClassName=TProjectRunConfiguationsNode [Project\ChildNodes\Node1\ChildNodes\Node0] ClassName=TProjectRunConfiguationNode -Name=install +Name=WAPT: install [Project\ChildNodes\Node1\ChildNodes\Node0\RunConfig] ScriptName=C:\Program Files (x86)\wapt\wapt-get.py +Description=Launch package installation. EngineType=peRemote ReinitializeBeforeRun=TRUE Parameters=install "$[Project-Path].." @@ -77,10 +94,11 @@ WorkingDirectory=$[ActiveScript-Dir] [Project\ChildNodes\Node1\ChildNodes\Node1] ClassName=TProjectRunConfiguationNode -Name=remove +Name=WAPT: remove [Project\ChildNodes\Node1\ChildNodes\Node1\RunConfig] ScriptName=C:\Program Files (x86)\wapt\wapt-get.py +Description=Launch uninstallation (the uninstallation code found in local wapt database, remember to launch after an installation). EngineType=peRemote ReinitializeBeforeRun=TRUE Parameters=remove "$[Project-Path].." @@ -98,13 +116,14 @@ WorkingDirectory=$[ActiveScript-Dir] [Project\ChildNodes\Node1\ChildNodes\Node2] ClassName=TProjectRunConfiguationNode -Name=session-setup +Name=WAPT: uninstall [Project\ChildNodes\Node1\ChildNodes\Node2\RunConfig] ScriptName=C:\Program Files (x86)\wapt\wapt-get.py +Description=Launch uninstallation code (for debugging purpose, it only runs the code of uninstall function). EngineType=peRemote ReinitializeBeforeRun=TRUE -Parameters=session-setup "$[Project-Path].." +Parameters=uninstall "$[Project-Path].." WorkingDir=$[Project-Path].. WriteOutputToFile=FALSE OutputFileName=$[ActiveScript-NoExt].log @@ -115,17 +134,18 @@ Caption=External Run Description=Run script using an external Python Interpreter ApplicationName=$[PythonExe-Short] Parameters=$[ActiveScript-Short] -WorkingDirectory=$[ActiveScript-Dir] +WorkingDirectory=$[Project-Path].. [Project\ChildNodes\Node1\ChildNodes\Node3] ClassName=TProjectRunConfiguationNode -Name=update +Name=WAPT: session-setup [Project\ChildNodes\Node1\ChildNodes\Node3\RunConfig] ScriptName=C:\Program Files (x86)\wapt\wapt-get.py +Description=Launch session-setup (it runs directly as current user). EngineType=peRemote ReinitializeBeforeRun=TRUE -Parameters=update +Parameters=session-setup "$[Project-Path].." WorkingDir=$[Project-Path].. WriteOutputToFile=FALSE OutputFileName=$[ActiveScript-NoExt].log @@ -140,14 +160,15 @@ WorkingDirectory=$[ActiveScript-Dir] [Project\ChildNodes\Node1\ChildNodes\Node4] ClassName=TProjectRunConfiguationNode -Name=upgrade +Name=WAPT: audit [Project\ChildNodes\Node1\ChildNodes\Node4\RunConfig] ScriptName=C:\Program Files (x86)\wapt\wapt-get.py +Description=Launch package audit. EngineType=peRemote ReinitializeBeforeRun=TRUE -Parameters=-f upgrade -WorkingDir=$[ActiveScript-Dir] +Parameters=audit -f "$[Project-Path].." +WorkingDir=$[Project-Path].. WriteOutputToFile=FALSE OutputFileName=$[ActiveScript-NoExt].log AppendToFile=FALSE @@ -161,13 +182,14 @@ WorkingDirectory=$[ActiveScript-Dir] [Project\ChildNodes\Node1\ChildNodes\Node5] ClassName=TProjectRunConfiguationNode -Name=-i build-upload +Name=WAPT: update-package [Project\ChildNodes\Node1\ChildNodes\Node5\RunConfig] ScriptName=C:\Program Files (x86)\wapt\wapt-get.py +Description=Launch update_package (it usually serve to update binaries of the package). EngineType=peRemote ReinitializeBeforeRun=TRUE -Parameters=-i build-upload "$[Project-Path].." +Parameters=update-package-sources "$[Project-Path].." WorkingDir=$[Project-Path].. WriteOutputToFile=FALSE OutputFileName=$[ActiveScript-NoExt].log @@ -182,13 +204,14 @@ WorkingDirectory=$[ActiveScript-Dir] [Project\ChildNodes\Node1\ChildNodes\Node6] ClassName=TProjectRunConfiguationNode -Name=svn update +Name=WAPT: -i build-upload [Project\ChildNodes\Node1\ChildNodes\Node6\RunConfig] ScriptName=C:\Program Files (x86)\wapt\wapt-get.py +Description=Build and upload package to the waptserver. EngineType=peRemote ReinitializeBeforeRun=TRUE -Parameters=sources "$[Project-Path].." +Parameters=--use-gui -i build-upload "$[Project-Path].." WorkingDir=$[Project-Path].. WriteOutputToFile=FALSE OutputFileName=$[ActiveScript-NoExt].log @@ -201,71 +224,8 @@ ApplicationName=$[PythonExe-Short] Parameters=$[ActiveScript-Short] WorkingDirectory=$[ActiveScript-Dir] -[Project\ChildNodes\Node1\ChildNodes\Node7] -ClassName=TProjectRunConfiguationNode -Name=uninstall - -[Project\ChildNodes\Node1\ChildNodes\Node7\RunConfig] -ScriptName=C:\Program Files (x86)\wapt\wapt-get.py -EngineType=peRemote -ReinitializeBeforeRun=TRUE -Parameters=uninstall "$[Project-Path].." -WorkingDir=$[Project-Path].. -WriteOutputToFile=FALSE -OutputFileName=$[ActiveScript-NoExt].log -AppendToFile=FALSE - -[Project\ChildNodes\Node1\ChildNodes\Node7\RunConfig\ExternalRun] -Caption=External Run -Description=Run script using an external Python Interpreter -ApplicationName=$[PythonExe-Short] -Parameters=$[ActiveScript-Short] -WorkingDirectory=$[Project-Path].. - -[Project\ChildNodes\Node1\ChildNodes\Node8] -ClassName=TProjectRunConfiguationNode -Name=update-package-sources - -[Project\ChildNodes\Node1\ChildNodes\Node8\RunConfig] -ScriptName=C:\Program Files (x86)\wapt\wapt-get.py -EngineType=peRemote -ReinitializeBeforeRun=TRUE -Parameters=update-package-sources "$[Project-Path].." -WorkingDir=$[Project-Path].. -WriteOutputToFile=FALSE -OutputFileName=$[ActiveScript-NoExt].log -AppendToFile=FALSE - -[Project\ChildNodes\Node1\ChildNodes\Node8\RunConfig\ExternalRun] -Caption=External Run -Description=Run script using an external Python Interpreter -ApplicationName=$[PythonExe-Short] -Parameters=$[ActiveScript-Short] -WorkingDirectory=$[ActiveScript-Dir] - -[Project\ChildNodes\Node1\ChildNodes\Node9] -ClassName=TProjectRunConfiguationNode -Name=audit - -[Project\ChildNodes\Node1\ChildNodes\Node9\RunConfig] -ScriptName=C:\Program Files (x86)\wapt\wapt-get.py -EngineType=peRemote -ReinitializeBeforeRun=TRUE -Parameters=audit -f "$[Project-Path].." -WorkingDir=$[Project-Path].. -WriteOutputToFile=FALSE -OutputFileName=$[ActiveScript-NoExt].log -AppendToFile=FALSE - -[Project\ChildNodes\Node1\ChildNodes\Node9\RunConfig\ExternalRun] -Caption=External Run -Description=Run script using an external Python Interpreter -ApplicationName=$[PythonExe-Short] -Parameters=$[ActiveScript-Short] -WorkingDirectory=$[ActiveScript-Dir] - [Project\ChildNodes\Node1\ChildNodes] -Count=10 +Count=7 [Project\ChildNodes] Count=2 diff --git a/setup.py b/setup.py index e60c290..d6415c6 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ def install(): open(makepath(programfiles,'OpenVPN','config','vpn.ovpn'),'w').write(variables['openvpn_config']) print('Disable remember password') - registry_setstring(HKEY_LOCAL_MACHINE, r'SOFTWARE\OpenVPN', 'disable_save_passwords', 1, REG_DWORD) + registry_setstring(HKEY_LOCAL_MACHINE, r'SOFTWARE\OpenVPN', 'disable_save_passwords', 0, REG_DWORD) print('Auto start OpenVPN') create_programs_menu_shortcut('OpenVPN',target=makepath(programfiles, 'OpenVPN', 'bin', 'openvpn-gui.exe'), folder='Startup')