Remove excess use of CD

gf-arm64
FriendlyNeighborhoodShane 4 years ago
parent fce1024a51
commit 0017883ab2

@ -14,7 +14,6 @@ abort() {
} }
workdir="$(pwd)"; workdir="$(pwd)";
cd "$workdir" || abort "Can't cd to $workdir";
resdir="$workdir/res"; resdir="$workdir/res";
resdldir="$workdir/resdl"; resdldir="$workdir/resdl";
reldir="$workdir/releases"; reldir="$workdir/releases";
@ -89,7 +88,7 @@ for file in "src/META-INF" "install.md" "LICENSE" "README.md"; do
done; done;
for object in $stuff $stuff_util; do for object in $stuff $stuff_util; do
for realobject in $resdir/"$object" $resdldir/"$object"; do for realobject in "$resdir/$object" "$resdldir/$object"; do
[ -e "$realobject" ] || continue; [ -e "$realobject" ] || continue;
echo " -- BUILDER: Copying $object"; echo " -- BUILDER: Copying $object";
mkdir -p "$tmpdir/$(dirname "$object")/"; mkdir -p "$tmpdir/$(dirname "$object")/";
@ -116,9 +115,9 @@ pre_build_actions;
echo " "; echo " ";
echo " - Zipping files..."; echo " - Zipping files...";
cd "$tmpdir" || abort "Can't cd to $tmpdir"; (
zip -r9q "$tmpdir/release.zip" "." || abort "Zip failed"; cd "$tmpdir" && zip -r9q "$tmpdir/release.zip" ".";
cd "$workdir" || abort "Can't cd to $workdir"; ) || abort "Zip failed";
# Post build actions # Post build actions

@ -14,7 +14,6 @@ abort() {
} }
workdir="$(pwd)"; workdir="$(pwd)";
cd "$workdir" || abort "Can't cd to $workdir";
echo " "; echo " ";
echo "-- Minimal MicroG Test Script --"; echo "-- Minimal MicroG Test Script --";

@ -14,7 +14,6 @@ abort() {
} }
workdir="$(pwd)"; workdir="$(pwd)";
cd "$workdir" || abort "Can't cd to $workdir";
confdir="$workdir/conf"; confdir="$workdir/conf";
resdir="$workdir/res"; resdir="$workdir/res";
resdldir="$workdir/resdl"; resdldir="$workdir/resdl";

Loading…
Cancel
Save