Restore native platform binaries symlinks after BigRedButton

Author: piranna

scripts/BigRedButton

@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
-source scripts/adjustEnvVars.sh
+set -o pipefail
+
+
+source scripts/adjustEnvVars.sh || exit $?
 
 
 #
@@ -12,15 +15,15 @@ PREBUILD=prebuilds/$KERNEL_NAME-$NODE_ARCH.tar.gz
 
 
 # Clean products previously to create them
-rm -rf ${PRODUCTS[@]} || exit 11
+rm -rf ${PRODUCTS[@]} || exit 1
 
 
 #
 # Build cross toolchain for all supported platforms
 #
 
-PLATFORM=pc_qemu_32 npm run build && PLATFORM=pc_qemu_32 npm test || exit 1
-PLATFORM=pc_qemu_64 npm run build && PLATFORM=pc_qemu_64 npm test || exit 2
+PLATFORM=pc_qemu_32 npm run build && PLATFORM=pc_qemu_32 npm test || exit 10
+PLATFORM=pc_qemu_64 npm run build && PLATFORM=pc_qemu_64 npm test || exit 11
 
 
 #
@@ -30,13 +33,19 @@ PLATFORM=pc_qemu_64 npm run build && PLATFORM=pc_qemu_64 npm test || exit 2
 STEP_DIR=$PREBUILD
 
 mkdir -p prebuilds                          &&
-tar -cf - ${PRODUCTS[@]} | gzip > $PREBUILD || err 12
+tar -cf - ${PRODUCTS[@]} | gzip > $PREBUILD || err 20
 
 
 #
 # Upload release to GitHub
 #
 
 if [ "$GITHUB_TOKEN" ]; then
-  prebuild --upload-all $GITHUB_TOKEN || exit 20
+  prebuild --upload-all $GITHUB_TOKEN || exit 30
 fi
+
+#
+# Restore binary symlinks
+#
+
+scripts/symlinks.sh || exit 40

scripts/install

@@ -4,8 +4,6 @@ set -o pipefail
 
 
 DOWNLOAD=https://github.com/NodeOS/nodeos-cross-toolchain/releases/download/v{version}/{platform}-{arch}.tar.gz
-SYMLINKS=(addr2line ar as c++filt elfedit gprof ld ld.bfd nm objcopy objdump \
-          ranlib readelf size strings strip c++ cpp g++ gcc gcov gcov-tool)
 
 
 #
@@ -14,23 +12,8 @@ SYMLINKS=(addr2line ar as c++filt elfedit gprof ld ld.bfd nm objcopy objdump \
 
 prebuild-install -d $DOWNLOAD || npm run build || exit 10
 
-
-# If host platform is not based on musl, don't create un-prefixed symlinks
-readlink /lib/ld-linux.so.2 | grep musl || exit 0
-
-
 #
-# Update the bypass symbolic links to point to the cross-toolchain binaries
+# Restore binary symlinks
 #
 
-PLATFORM=
-CPU=
-
-source scripts/adjustEnvVars.sh || exit $?
-
-mkdir -p bin || exit 20
-
-for i in "${SYMLINKS[@]}"
-do
-  ln -sf $TARGET-$i bin/$i || exit 21
-done
+scripts/symlinks.sh || exit 20

scripts/symlinks.sh

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+set -o pipefail
+
+
+SYMLINKS=(addr2line ar as c++filt elfedit gprof ld ld.bfd nm objcopy objdump \
+          ranlib readelf size strings strip c++ cpp g++ gcc gcov gcov-tool)
+
+
+#
+# (Re-)create the bypass symlinks to the native platform binaries
+#
+
+for i in "${SYMLINKS[@]}"
+do
+  cp bypass.js bin/$i || exit 1
+done
+
+
+# If host platform is not based on musl, don't create un-prefixed symlinks
+readlink /lib/ld-linux.so.2 | grep musl || exit 0
+
+
+#
+# Update the bypass symbolic links to point to the cross-toolchain binaries
+#
+
+PLATFORM=
+CPU=
+
+source scripts/adjustEnvVars.sh || exit $?
+
+mkdir -p bin || exit 10
+
+for i in "${SYMLINKS[@]}"
+do
+  ln -sf $TARGET-$i bin/$i || exit 11
+done