Skip to content

Commit

Permalink
Bug 1596775: Cleanup shellcheck errors on imported code; r=ahal
Browse files Browse the repository at this point in the history
Differential Revision: https://phabricator.services.mozilla.com/D55326

--HG--
extra : moz-landing-system : lando
  • Loading branch information
tomprince committed Dec 11, 2019
1 parent 0f59971 commit 457d8cb
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
8 changes: 4 additions & 4 deletions taskcluster/docker/system-symbols-mac/setup.sh
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
#!/bin/sh
set -v -e -x

ncpu=-j`grep -c ^processor /proc/cpuinfo`
ncpu=-j$(grep -c ^processor /proc/cpuinfo)

WORK=/setup/
cd $WORK
git clone https://github.com/mackyle/xar xar
cd xar/xar
./autogen.sh --prefix=/home/worker
make $ncpu && make install
make "$ncpu" && make install

cd $WORK
git clone -b from_zarvox https://github.com/andreas56/libdmg-hfsplus.git
cd libdmg-hfsplus
cmake .
make $ncpu dmg-bin hfsplus
make "$ncpu" dmg-bin hfsplus
# `make install` installs way too much stuff
cp dmg/dmg hfs/hfsplus /home/worker/bin
strip /home/worker/bin/dmg /home/worker/bin/hfsplus
Expand All @@ -28,7 +28,7 @@ fetch breakpad
cd src
touch README
./configure
make $ncpu src/tools/mac/dump_syms/dump_syms_mac
make "$ncpu" src/tools/mac/dump_syms/dump_syms_mac
# `make install` is broken because there are two dump_syms binaries.
cp src/tools/mac/dump_syms/dump_syms_mac /home/worker/bin
strip /home/worker/bin/dump_syms_mac
Expand Down
11 changes: 6 additions & 5 deletions tools/crashreporter/system-symbols/mac/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -v -e -x

base="$(realpath $(dirname $0))"
base="$(realpath "$(dirname "$0")")"
export PATH="$PATH:/home/worker/bin:$base"

cd /home/worker
Expand All @@ -11,9 +11,9 @@ if test "$PROCESSED_PACKAGES"; then
curl -L "$PROCESSED_PACKAGES" | gzip -dc > processed-packages
# Prevent reposado from downloading packages that have previously been
# dumped.
for f in `cat processed-packages`; do
mkdir -p `dirname $f`
touch $f
for f in $(cat processed-packages); do
mkdir -p "$(dirname "$f")"
touch "$f"
done
fi

Expand All @@ -24,6 +24,7 @@ repo_sync --no-download

# Next, fetch just the update packages we're interested in.
packages=$(python "${base}/list-packages.py")
# shellcheck disable=SC2086
repo_sync $packages

du -sh /opt/data-reposado
Expand All @@ -36,4 +37,4 @@ python "${base}/PackageSymbolDumper.py" --tracking-file=/home/worker/processed-p
gzip -c processed-packages > artifacts/processed-packages.gz

cd symbols
zip -r9 /home/worker/artifacts/target.crashreporter-symbols.zip * || echo "No symbols dumped"
zip -r9 /home/worker/artifacts/target.crashreporter-symbols.zip ./* || echo "No symbols dumped"
2 changes: 1 addition & 1 deletion tools/crashreporter/system-symbols/win/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -v -e -x

base="$(realpath $(dirname $0))"
base="$(realpath "$(dirname "$0")")"

mkdir -p artifacts
PYTHONPATH=$PWD python "${base}/symsrv-fetch.py" artifacts/target.crashreporter-symbols.zip

0 comments on commit 457d8cb

Please sign in to comment.