diff --git a/WAPT/control b/WAPT/control index 4a294a5..33dacd1 100644 --- a/WAPT/control +++ b/WAPT/control @@ -1,5 +1,5 @@ package : fws-thunderbird-sogo-addons -version : 68.0.1-1 +version : 68.0.1-2 architecture : all section : base priority : optional @@ -27,12 +27,12 @@ editor : Inverse keywords : caldav,carddav,sogo licence : homepage : https://sogo.nu -package_uuid : e564e3a7-a606-4b31-ab5d-5fd770f9917a +package_uuid : b9b86424-2950-428c-ab25-04da11e822dc valid_from : valid_until : forced_install_on : signer : Daniel Berteaud signer_fingerprint: 3c9415559e2dedbc4390e3faa2c28d3b67265baa5b35902d2764d9e41c3b3f0a -signature : 5FkWGTY4jFSp3uxQSier0+rMdKmeiScE4PAtUfszCzsKQur3h9M4beQ6KIwUTvm7L1BkQNRCnGQ8F2SB2EkHNC7W8LpLEwXnkbo02BiDk+ITdGv++LdP8LGXuLAoBp3AG4adfdsPZ+sI8dIXPAHpNhcOyxedgltHJLFgj5yir4W6PALANigpywqLChw4zyIouD337iq6l9hO015+9L4csbg0l92zZDyvhfXkwiH5acQ/Oe0g+7knkUL8FA2fsDbdVO9oEvHVaMlSRjpePvFkfDhUxsAGr9aPItH4MlFk+rxgzK6oh9lNvBUoQMzwkPRGFQmtzkxVW6Sr76K1D5w7gw== -signature_date : 2020-01-06T09:11:52.614000 +signature : sP7U7wGVEdmGZ4LuyHtrYLkEFkfsbgYLuiljUAQWFLDTQAVocer9tt/sdAU3SMolXPj3kCm12WB2Kx3qPVbbXO94q4qmWO8ABGkqeVDm/MXUzgQnMcd0ir6sAYk7fnJvv3a7EfYl4JchkwKjxRrvNVMgZom7tngZ/zQiUy+ShFnC6QSvVui328MWZmpksisPcAMjJNFBx8f+tU+V6fzpORiLkIrPArokyIXFurN192F/+1ZqE2SgeFyXgnkDldFD81S8qtLGJff1XTRmnm4yE3dUb5es/HVsYISUw8mCVvg8QAmlqEO5n7HLnUjECHEjKoqr38wD+pBTdTbACDMSog== +signature_date : 2020-01-27T09:02:54.704000 signed_attributes : package,version,architecture,section,priority,name,categories,maintainer,description,depends,conflicts,maturity,locale,target_os,min_os_version,max_os_version,min_wapt_version,sources,installed_size,impacted_process,description_fr,description_pl,description_de,description_es,audit_schedule,editor,keywords,licence,homepage,package_uuid,valid_from,valid_until,forced_install_on,signer,signer_fingerprint,signature_date,signed_attributes \ No newline at end of file diff --git a/WAPT/wapt.psproj b/WAPT/wapt.psproj index a78ccf6..9390504 100644 --- a/WAPT/wapt.psproj +++ b/WAPT/wapt.psproj @@ -23,11 +23,11 @@ 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\wapt-get.ini [Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3] ClassName=TProjectFileNode -FileName=C:\Program Files (x86)\wapt\wapt-get.ini +FileName=C:\Program Files (x86)\wapt\wapt-get.py [Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4] ClassName=TProjectFileNode @@ -46,14 +46,10 @@ FileName=$[Project-Path]control [Project\ChildNodes\Node0\ChildNodes\Node3] ClassName=TProjectFileNode -FileName=C:\waptdev\wapt-thunderbird-sogo-addons\reset_addons.bat.j2 - -[Project\ChildNodes\Node0\ChildNodes\Node4] -ClassName=TProjectFileNode FileName=$[Project-Path]..\setup.py [Project\ChildNodes\Node0\ChildNodes] -Count=5 +Count=4 [Project\ChildNodes\Node1] ClassName=TProjectRunConfiguationsNode diff --git a/reset_addons.bat.j2 b/reset_addons.bat.j2 deleted file mode 100644 index ed6599a..0000000 --- a/reset_addons.bat.j2 +++ /dev/null @@ -1,14 +0,0 @@ - -for /f %%a in ('dir /b "%APPDATA%\Thunderbird\Profiles\*.default"') do SET TBPROFILE=%APPDATA%\Thunderbird\Profiles\%%a -IF NOT EXIST "%TBPROFILE%" GOTO :EOF -IF EXIST "%TBPROFILE%\extensions.json" ( - IF NOT EXIST "%TBPROFILE%\extensions.{{ tb_major_version }}.json" ( - rename "%TBPROFILE%\extensions.json" extensions.{{ tb_major_version }}.json - ) -) - -IF EXIST "%TBPROFILE%\addonStartup.json.lz4" ( - IF NOT EXIST "%TBPROFILE%\addonStartup.{{ tb_major_version }}.json.lz4" ( - rename "%TBPROFILE%\addonStartup.json.lz4" addonStartup.{{ tb_major_version }}.json.lz4 - ) -) \ No newline at end of file diff --git a/setup.py b/setup.py index 3b426f0..ee9fbcc 100644 --- a/setup.py +++ b/setup.py @@ -53,23 +53,10 @@ def install(): # Note : we could remove the extension directory, but we keep it for easier auditing - # Script to reset extensions.json and addonStartup.json.lz4, those files need to be removed - # for sogo-connector to be correctly loaded. At least for the 60.x -> 68.x upgrade - print('Deploy reset_addons.bat script') - open(makepath(programfiles,'Mozilla Thunderbird','reset_addons.bat'),'w').write( - jinja2.get_template('reset_addons.bat.j2').render( - tb_major_version = major_version - ) - ) - def uninstall(): print('Removing SOGo connector for Thunderbird') remove_tree(makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-connector@inverse.ca' % extension)) -def session_setup(): - print('Reset Thunderbird addons settings on major upgrades') - run(makepath(programfiles,'Mozilla Thunderbird','reset_addons.bat')) - def audit(): connector_version = control['version'].split('-',1)[0] try: