Skip to content

Commit b98fdef

Browse files
author
ryan.kuba
committed
move out of logic loop to run properly
1 parent 915c515 commit b98fdef

File tree

1 file changed

+19
-15
lines changed
  • root/etc/s6-overlay/s6-rc.d/init-mod-universal-internationalization-install

1 file changed

+19
-15
lines changed

root/etc/s6-overlay/s6-rc.d/init-mod-universal-internationalization-install/run

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -736,21 +736,25 @@ elif [[ "${LSIO_BASE}" == "arch" ]] && [[ ! -f /usr/share/fonts/noto-cjk/NotoSan
736736
echo "Generating Locale for ${LOCALE}"
737737
localedef -i ${LOCALE} -f UTF-8 ${LOCALE}.UTF-8
738738
done
739-
# Add Firefox Langpacks
740-
if which firefox; then
741-
FIREFOX_VERSION=$(curl -sI https://download.mozilla.org/?product=firefox-latest | awk -F '(releases/|/win32)' '/Location/ {print $2}')
742-
RELEASE_URL="https://releases.mozilla.org/pub/firefox/releases/${FIREFOX_VERSION}/win64/xpi/"
743-
LANGS=$(curl -Ls ${RELEASE_URL} | awk -F '(xpi">|</a>)' '/href.*xpi/ {print $2}' | tr '\n' ' ')
744-
EXTENSION_DIR=/usr/lib/firefox-addons/distribution/extensions/
745-
mkdir -p ${EXTENSION_DIR}
746-
for LANG in ${LANGS}; do
747-
LANGCODE=$(echo ${LANG} | sed 's/\.xpi//g')
748-
echo "Downloading ${LANG} Firefox Language pack"
749-
curl -o \
750-
${EXTENSION_DIR}langpack-${LANGCODE}@firefox.mozilla.org.xpi -Ls \
751-
${RELEASE_URL}${LANG}
752-
done
753-
fi
754739
else
755740
echo "**** International Fonts/Locales installed skipping ****"
756741
fi
742+
743+
# Add Firefox Langpacks
744+
if which firefox && [ ! -f /langlock ]; then
745+
echo "Installing firefox langpacks"
746+
FIREFOX_VERSION=$(curl -sI https://download.mozilla.org/?product=firefox-latest | awk -F '(releases/|/win32)' '/Location/ {print $2}')
747+
RELEASE_URL="https://releases.mozilla.org/pub/firefox/releases/${FIREFOX_VERSION}/win64/xpi/"
748+
LANGS=$(curl -Ls ${RELEASE_URL} | awk -F '(xpi">|</a>)' '/href.*xpi/ {print $2}' | tr '\n' ' ')
749+
EXTENSION_DIR=/usr/lib/firefox-addons/distribution/extensions/
750+
mkdir -p ${EXTENSION_DIR}
751+
for LANG in ${LANGS}; do
752+
LANGCODE=$(echo ${LANG} | sed 's/\.xpi//g')
753+
echo "Downloading ${LANG} Firefox Language pack"
754+
curl -o \
755+
${EXTENSION_DIR}langpack-${LANGCODE}@firefox.mozilla.org.xpi -Ls \
756+
${RELEASE_URL}${LANG}
757+
done
758+
fi
759+
760+
touch /langlock

0 commit comments

Comments
 (0)