Verified Commit 80bf912f authored by intrigeri's avatar intrigeri

Lint

parent 02586cd8
Pipeline #513 passed with stage
in 4 minutes and 7 seconds
......@@ -21,6 +21,7 @@ for dir in config/APT_snapshots.d vagrant/definitions/tails-builder/config/APT_s
cd "${dir}"
for ARCHIVE in * ; do
if ! grep -qs '^latest$' "$ARCHIVE"/serial; then
# shellcheck disable=SC2029
ssh reprepro-time-based-snapshots@incoming.deb.tails.boum.org \
tails-bump-apt-snapshot-valid-until \
"$ARCHIVE" "$(cat "$ARCHIVE"/serial)" \
......
......@@ -17,7 +17,10 @@ BRANCH="$1"
### Merge the APT overlays in reprepro
git checkout "$BRANCH"
for overlay in $(ls config/APT_overlays.d/) ; do
for overlay in config/APT_overlays.d/* ; do
# handle the case when there is no overlay
[[ -e "$overlay" ]] || break
# shellcheck disable=SC2029
if ! ssh reprepro@incoming.deb.tails.boum.org \
tails-merge-suite "$overlay" "$BRANCH" ; then
error "Failed to merge '$overlay' into '$BRANCH': $?"
......
......@@ -258,6 +258,7 @@ supported_locale () {
local locale
locale="$1"
# shellcheck disable=SC2013
for supported_language in $(cat "$LANGUAGES_FILE") ; do
if echo "$locale" | grep -qs -E "^${supported_language}"; then
return 0
......
......@@ -37,12 +37,13 @@ enigmail_configured() {
}
notify_enigmail_migration() {
local dialog_msg="<b><big>`gettext \"You need to migrate your OpenPGP keys\"`</big></b>
local dialog_msg open_docs ignore
dialog_msg="<b><big>$(gettext "You need to migrate your OpenPGP keys")</big></b>
`gettext \"<i>Thunderbird</i> 78 now replaces the <i>Enigmail</i> extension with built-in support for OpenPGP encryption. To continue using your OpenPGP keys in <i>Thunderbird</i>, follow our migration instructions.\"`
$(gettext "<i>Thunderbird</i> 78 now replaces the <i>Enigmail</i> extension with built-in support for OpenPGP encryption. To continue using your OpenPGP keys in <i>Thunderbird</i>, follow our migration instructions.")
"
local open_docs="`gettext \"_Open Migration Instructions\"`"
local ignore="`gettext \"_Migrate Later\"`"
open_docs=$(gettext "_Open Migration Instructions")
ignore=$(gettext "_Migrate Later")
zenity --question --width 480 --title "OpenPGP Migration" --text "${dialog_msg}" \
--ok-label "${open_docs}" --cancel-label "${ignore}"
}
......
......@@ -319,4 +319,5 @@ fi
export USER_DISPLAY="${DISPLAY:-}"
export DISPLAY=${TARGET_DISPLAY}
# shellcheck disable=SC2086
cucumber --expand ${TAGS_ARGS} "${@}"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment