diff --git a/docker/zammad/setup.rb b/docker/zammad/setup.rb index 612b5bb..7770aa0 100644 --- a/docker/zammad/setup.rb +++ b/docker/zammad/setup.rb @@ -1,15 +1,10 @@ # frozen_string_literal: true -base_path = '/opt/zammad/contrib/link/addons' - -packages = Dir.glob("#{base_path}/*") - -puts "Available packages: #{packages}" -puts "Installed packages: #{Package.all.map(&:version)}" +packages = Dir.glob('/opt/zammad/contrib/link/addons/*') packages.each do |package| puts "Installing #{package} package..." - Package.install(file: package, reinstall: true) + Package.install(file: package) rescue StandardError => e - puts "Error #{e.message}" + puts e.message end diff --git a/packages/zammad-addon-common/build.ts b/packages/zammad-addon-common/build.ts index ce511f5..546a134 100644 --- a/packages/zammad-addon-common/build.ts +++ b/packages/zammad-addon-common/build.ts @@ -1,6 +1,8 @@ #!/usr/bin/env node import { promises as fs } from "fs"; +import { promisify } from "util"; +import glob from "glob"; import path from "path"; import os from "os"; @@ -17,7 +19,7 @@ const packageFile = async (actualPath: string): Promise => { encode: "base64", content, }; -} +}; const packageFiles = async () => { const packagedFiles: any[] = []; @@ -39,7 +41,7 @@ const packageFiles = async () => { await processDir("./src/"); return packagedFiles; -} +}; export const createZPM = async ({ name, displayName, version }: Record) => { const files = await packageFiles(); @@ -52,16 +54,28 @@ export const createZPM = async ({ name, displayName, version }: Record { const packageJSON = JSON.parse(await fs.readFile("./package.json", "utf-8")); const { name, displayName, version } = packageJSON; console.log(`Building addon ${displayName} v${version}`); await createZPM({ name, displayName, version }); -} +}; main(); diff --git a/packages/zammad-addon-pgp/package.json b/packages/zammad-addon-pgp/package.json index cb14a14..8c430c6 100644 --- a/packages/zammad-addon-pgp/package.json +++ b/packages/zammad-addon-pgp/package.json @@ -1,7 +1,7 @@ { "name": "zammad-addon-pgp", "displayName": "PGP", - "version": "2.0.2", + "version": "2.0.0", "description": "Adds PGP integration into [Zammad](https://zammad.org) via [Sequoia](https://sequoia-pgp.org).", "scripts": { "build": "node ../../node_modules/zammad-addon-common/dist/build.js", diff --git a/packages/zammad-addon-pgp/src/app/assets/javascripts/app/controllers/_ui_element/_application_action.coffee b/packages/zammad-addon-pgp/src/app/assets/javascripts/app/controllers/_ui_element/_application_action.coffee index db22944..b083e50 100644 --- a/packages/zammad-addon-pgp/src/app/assets/javascripts/app/controllers/_ui_element/_application_action.coffee +++ b/packages/zammad-addon-pgp/src/app/assets/javascripts/app/controllers/_ui_element/_application_action.coffee @@ -584,7 +584,7 @@ class App.UiElement.ApplicationAction options: { 'no': __('Do not sign email') 'discard': __('Sign email (if not possible, discard notification)') - 'always': __('Sign daha email (if not possible, send notification anyway)') + 'always': __('Sign email (if not possible, send notification anyway)') } value: meta.sign translate: true diff --git a/packages/zammad-addon-pgp/src/app/assets/javascripts/app/views/integration/pgp.jst.eco b/packages/zammad-addon-pgp/src/app/assets/javascripts/app/views/integration/pgp.jst.eco index eff0fbd..a407978 100644 --- a/packages/zammad-addon-pgp/src/app/assets/javascripts/app/views/integration/pgp.jst.eco +++ b/packages/zammad-addon-pgp/src/app/assets/javascripts/app/views/integration/pgp.jst.eco @@ -8,7 +8,7 @@

<%- @T('Default Behavior') %>

-

Choose the default behavior of the PGP integration on per group basis. If signing or encrypting is not possible, the setting has no effect. Agents call always manually alter the behavior for each article.

+

Choose the default behavior of the PGP integration on per group basis. If signing or encrypting is not possible, the setting has no effect. Agents can always manually alter the behavior for each article.

<%- @T('Update') %>