From 378b548aae563c5a96ceddb9ffde465e3e32d9a9 Mon Sep 17 00:00:00 2001 From: oupala Date: Tue, 26 Oct 2021 15:01:38 +0200 Subject: [PATCH 1/2] fix: dependency requirement procps was missing in the dependency requirement. --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index b5c418da4..8a21c0932 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,7 @@ RUN apt install --no-install-recommends --assume-yes \ gettext \ man-db \ psmisc \ + procps \ nano \ tree \ bsdmainutils \ From 1dd5c4126c5d93359c8732eb1c723a73be178c60 Mon Sep 17 00:00:00 2001 From: oupala Date: Tue, 26 Oct 2021 14:50:00 +0200 Subject: [PATCH 2/2] fix: typo in dependency The required dependency was psproc (or various other spelling) while the correct spelling is procps. --- missions/intermediate/04_bg_xeyes/i18n/en.po | 4 ++-- missions/intermediate/04_bg_xeyes/i18n/fr.po | 4 ++-- missions/intermediate/04_bg_xeyes/i18n/template.pot | 2 +- missions/intermediate/04_bg_xeyes/init.sh | 2 +- missions/processes/00_shared/init.sh | 2 +- missions/processes/01_ps_kill/i18n/en.po | 4 ++-- missions/processes/01_ps_kill/i18n/fr.po | 4 ++-- missions/processes/01_ps_kill/i18n/template.pot | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/missions/intermediate/04_bg_xeyes/i18n/en.po b/missions/intermediate/04_bg_xeyes/i18n/en.po index 1c79f558c..8a8082b14 100644 --- a/missions/intermediate/04_bg_xeyes/i18n/en.po +++ b/missions/intermediate/04_bg_xeyes/i18n/en.po @@ -17,9 +17,9 @@ msgstr "Have you run the 'xeyes' command directly?" #, sh-format msgid "The command 'ps' is required for mission $MISSION_NAME.\n" - "(Debian / Ubuntu: install package 'psproc')" + "(Debian / Ubuntu: install package 'procps')" msgstr "The command 'ps' is required for mission $MISSION_NAME.\n" - "(Debian / Ubuntu: install package 'psproc')" + "(Debian / Ubuntu: install package 'procps')" #, sh-format msgid "The command 'xeyes' is required for mission $MISSION_NAME.\n" diff --git a/missions/intermediate/04_bg_xeyes/i18n/fr.po b/missions/intermediate/04_bg_xeyes/i18n/fr.po index 1c32008af..7f15d5a41 100644 --- a/missions/intermediate/04_bg_xeyes/i18n/fr.po +++ b/missions/intermediate/04_bg_xeyes/i18n/fr.po @@ -16,9 +16,9 @@ msgstr "Avez vous lancé la commande 'xeyes' directement." #, sh-format msgid "The command 'ps' is required for mission $MISSION_NAME.\n" - "(Debian / Ubuntu: install package 'psproc')" + "(Debian / Ubuntu: install package 'procps')" msgstr "La commande 'ps' est nécessaire pour la mission $MISSION_NAME.\n" - "(Debian / Ubuntu : installez le paquet 'ps-proc')" + "(Debian / Ubuntu : installez le paquet 'procps')" #, sh-format msgid "The command 'xeyes' is required for mission $MISSION_NAME.\n" diff --git a/missions/intermediate/04_bg_xeyes/i18n/template.pot b/missions/intermediate/04_bg_xeyes/i18n/template.pot index c7c7eb053..1e458afa7 100644 --- a/missions/intermediate/04_bg_xeyes/i18n/template.pot +++ b/missions/intermediate/04_bg_xeyes/i18n/template.pot @@ -16,7 +16,7 @@ msgstr "" #, sh-format msgid "The command 'ps' is required for mission $MISSION_NAME.\n" - "(Debian / Ubuntu: install package 'psproc')" + "(Debian / Ubuntu: install package 'procps')" msgstr "" #, sh-format diff --git a/missions/intermediate/04_bg_xeyes/init.sh b/missions/intermediate/04_bg_xeyes/init.sh index 8ca061db1..58b46e0dc 100644 --- a/missions/intermediate/04_bg_xeyes/init.sh +++ b/missions/intermediate/04_bg_xeyes/init.sh @@ -10,7 +10,7 @@ elif ! command -v xeyes >/dev/null; then false elif ! command -v ps >/dev/null; then echo "$(eval_gettext "The command 'ps' is required for mission \$MISSION_NAME. -(Debian / Ubuntu: install package 'psproc')")" >&2 +(Debian / Ubuntu: install package 'procps')")" >&2 false else true diff --git a/missions/processes/00_shared/init.sh b/missions/processes/00_shared/init.sh index 4df32639c..55555faea 100644 --- a/missions/processes/00_shared/init.sh +++ b/missions/processes/00_shared/init.sh @@ -16,7 +16,7 @@ _mission_init() ( elif ! command -v ps >/dev/null then echo "$(eval_gettext "The command 'ps' is required for mission \$MISSION_NAME. -(Debian / Ubuntu: install package 'psproc')")" +(Debian / Ubuntu: install package 'procps')")" return 1 fi return 0 diff --git a/missions/processes/01_ps_kill/i18n/en.po b/missions/processes/01_ps_kill/i18n/en.po index 1a971f7c8..440e6105c 100644 --- a/missions/processes/01_ps_kill/i18n/en.po +++ b/missions/processes/01_ps_kill/i18n/en.po @@ -18,9 +18,9 @@ msgstr "Process names should be equal to the corresponding filename for mission #, sh-format msgid "The command 'ps' is required for mission $MISSION_NAME.\n" - "(Debian / Ubuntu: install package 'psproc')" + "(Debian / Ubuntu: install package 'procps')" msgstr "The command 'ps' is required for mission $MISSION_NAME.\n" - "(Debian / Ubuntu: install package 'psproc')" + "(Debian / Ubuntu: install package 'procps')" msgid "The spell is still running!" msgstr "The spell is still running!" diff --git a/missions/processes/01_ps_kill/i18n/fr.po b/missions/processes/01_ps_kill/i18n/fr.po index 26bbaa37d..2bcb769c2 100644 --- a/missions/processes/01_ps_kill/i18n/fr.po +++ b/missions/processes/01_ps_kill/i18n/fr.po @@ -17,9 +17,9 @@ msgstr "Les nom des processus doivent être égaux au nom du fichier correspond #, sh-format msgid "The command 'ps' is required for mission $MISSION_NAME.\n" - "(Debian / Ubuntu: install package 'psproc')" + "(Debian / Ubuntu: install package 'procps')" msgstr "La command 'ps' est nécessaire pour la mission $MISSION_NAME.\n" - "(Debian / Ubuntu : installez le paquet 'psproc')" + "(Debian / Ubuntu : installez le paquet 'procps')" msgid "The spell is still running!" msgstr "Le sortilège est toujours en fonctionnement !" diff --git a/missions/processes/01_ps_kill/i18n/template.pot b/missions/processes/01_ps_kill/i18n/template.pot index b45a0a6af..f92906d30 100644 --- a/missions/processes/01_ps_kill/i18n/template.pot +++ b/missions/processes/01_ps_kill/i18n/template.pot @@ -17,7 +17,7 @@ msgstr "" #, sh-format msgid "The command 'ps' is required for mission $MISSION_NAME.\n" - "(Debian / Ubuntu: install package 'psproc')" + "(Debian / Ubuntu: install package 'procps')" msgstr "" msgid "The spell is still running!"