| 1 |
commit: 5b8d3228512547d28f4aef9137c19fe7f670804c |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 2 15:18:55 2016 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 2 15:19:25 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=5b8d3228 |
| 7 |
|
| 8 |
generate_langpacks.sh: use pushd/popd instead of cd |
| 9 |
|
| 10 |
scripts/generate_langpacks.sh | 12 ++++++++---- |
| 11 |
1 file changed, 8 insertions(+), 4 deletions(-) |
| 12 |
|
| 13 |
diff --git a/scripts/generate_langpacks.sh b/scripts/generate_langpacks.sh |
| 14 |
index 8530e34..e0552cb 100755 |
| 15 |
--- a/scripts/generate_langpacks.sh |
| 16 |
+++ b/scripts/generate_langpacks.sh |
| 17 |
@@ -70,11 +70,12 @@ if ! [[ -e ${l10n_releasedir}/mozlangs.cached ]]; then |
| 18 |
for abcd in "${MOZ_LANGS[@]}" ; do |
| 19 |
if [[ ! -d ${L10N_STAGING_DIR%/}/${l10nrepo}/${abcd} ]]; then |
| 20 |
mkdir -p ${L10N_STAGING_DIR%/}/${l10nrepo} |
| 21 |
- cd ${L10N_STAGING_DIR%/}/${l10nrepo} |
| 22 |
+ pushd ${L10N_STAGING_DIR%/}/${l10nrepo} &>/dev/null || die |
| 23 |
hg clone "http://hg.mozilla.org/releases/l10n/${l10nrepo}/${abcd}" |
| 24 |
+ popd &>/dev/null || die |
| 25 |
fi |
| 26 |
if [[ -d ${L10N_STAGING_DIR%/}/${l10nrepo}/${abcd} ]]; then |
| 27 |
- cd ${L10N_STAGING_DIR%/}/${l10nrepo}/${abcd} |
| 28 |
+ pushd ${L10N_STAGING_DIR%/}/${l10nrepo}/${abcd} &>/dev/null || die |
| 29 |
hg pull |
| 30 |
if hg tags |grep ${uctarget//\./_}_RELEASE &>/dev/null; then |
| 31 |
rev="-r ${uctarget//\./_}_RELEASE" |
| 32 |
@@ -85,6 +86,7 @@ if ! [[ -e ${l10n_releasedir}/mozlangs.cached ]]; then |
| 33 |
rev= |
| 34 |
fi |
| 35 |
hg archive ${rev} -t files ${l10n_releasedir}/src/${abcd} |
| 36 |
+ popd &>/dev/null || die |
| 37 |
fi |
| 38 |
done |
| 39 |
cp ${l10n_releasedir}/mozlangs{,.cached} |
| 40 |
@@ -139,7 +141,7 @@ fi |
| 41 |
|
| 42 |
|
| 43 |
function package_lightning { |
| 44 |
- cd ${S}/dist/xpi-stage |
| 45 |
+ pushd ${S}/dist/xpi-stage &>/dev/null || die |
| 46 |
cp -rL lightning stage-lightning |
| 47 |
for ech in lightning-*; do |
| 48 |
if [[ -d $ech ]]; then |
| 49 |
@@ -164,10 +166,11 @@ function package_lightning { |
| 50 |
cd .. |
| 51 |
mv stage-lightning lightning-${vers} |
| 52 |
tar -Jcf ${l10n_releasedir}/lightning-${vers}.tar.xz lightning-${vers} |
| 53 |
+ popd &>/dev/null || die |
| 54 |
} |
| 55 |
|
| 56 |
function package_gdata_provider { |
| 57 |
- cd ${S}/dist/xpi-stage |
| 58 |
+ pushd ${S}/dist/xpi-stage &>/dev/null || die |
| 59 |
cp -rL gdata-provider stage-gdata-provider |
| 60 |
for ech in gdata-provider-*; do |
| 61 |
if [[ -d $ech ]]; then |
| 62 |
@@ -192,6 +195,7 @@ function package_gdata_provider { |
| 63 |
cd .. |
| 64 |
mv stage-gdata-provider gdata-provider-${vers} |
| 65 |
tar -Jcf ${l10n_releasedir}/gdata-provider-${vers}.tar.xz gdata-provider-${vers} |
| 66 |
+ popd &>/dev/null || die |
| 67 |
} |
| 68 |
|
| 69 |
# run the locales |
Archives