Public_Skunkworks/joeylib
Public_Skunkworks/joeylib
1
0
Fork 0
Code Issues 10 Pull requests Projects Releases Packages Wiki Activity Actions

Switched incorrect &&s to ||s.

Browse source
This commit is contained in:
Scott Duensing 2022-09-26 18:08:49 -05:00
parent 051c81d3d2
commit 1fe91473b5
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripts/buildVm.sh
View file

@ -209,14 +209,14 @@ function buildJoeyLib() {
git clone https://skunkworks.kangaroopunch.com/skunkworks/joeylib.git git clone https://skunkworks.kangaroopunch.com/skunkworks/joeylib.git
fi fi
rm -rf dist/${NAME}-${ARCH} && true rm -rf dist/${NAME}-${ARCH} || true
mkdir -p dist/${NAME}-${ARCH} mkdir -p dist/${NAME}-${ARCH}
pushd dist/${NAME}-${ARCH} pushd dist/${NAME}-${ARCH}
case ${BACKEND} in case ${BACKEND} in
orca) orca)
OUT=${GOLDEN_GATE}/out/joey OUT=${GOLDEN_GATE}/out/joey
rm -rf ${OUT} && true rm -rf ${OUT} || true
mkdir -p ${OUT}/out/joey mkdir -p ${OUT}/out/joey
pushd ${SRC} pushd ${SRC}
iix assemble jIIgs.asm keep=31:/out/joey/jIIgsasm iix assemble jIIgs.asm keep=31:/out/joey/jIIgsasm
@ -240,7 +240,7 @@ function buildJoeyLib() {
${AR} x ${INSTALLED}/lib/libSDL2main.a ${AR} x ${INSTALLED}/lib/libSDL2main.a
${AR} rcs libjoeylib.a *.o ${AR} rcs libjoeylib.a *.o
rm *.o rm *.o
rm __.SYMDEF* && true rm __.SYMDEF* || true
;; ;;
esac esac
@ -283,7 +283,7 @@ function buildSDL2() {
git checkout ${TAG} git checkout ${TAG}
popd popd
rm -rf build && true rm -rf build || true
mkdir -p build mkdir -p build
pushd build pushd build
@ -305,7 +305,7 @@ function buildSDL2() {
function configureSFTP() { function configureSFTP() {
if [[ ! -f /etc/ssh/sftponly_ready ]]; then if [[ ! -f /etc/ssh/sftponly_ready ]]; then
sudo addgroup sftponly && true sudo addgroup sftponly || true
sudo sed -i 's/^Subsystem/#Subsystem/g' /etc/ssh/sshd_config sudo sed -i 's/^Subsystem/#Subsystem/g' /etc/ssh/sshd_config
echo "Subsystem sftp internal-sftp -f AUTH -l VERBOSE" | sudo tee -a /etc/ssh/sshd_config echo "Subsystem sftp internal-sftp -f AUTH -l VERBOSE" | sudo tee -a /etc/ssh/sshd_config
echo "Match Group sftponly" | sudo tee -a /etc/ssh/sshd_config echo "Match Group sftponly" | sudo tee -a /etc/ssh/sshd_config
@ -693,7 +693,7 @@ function setCompiler() {
export LD_LIBRARY_PATH=${EHOME}/cross/${NAME}/lib export LD_LIBRARY_PATH=${EHOME}/cross/${NAME}/lib
export CC=${TRIPLE}-clang export CC=${TRIPLE}-clang
export AR=${TRIPLE}-ar export AR=${TRIPLE}-ar
sudo rm -f /usr/lib/llvm-10/lib/clang/10.0.0/lib/darwin && true sudo rm -f /usr/lib/llvm-10/lib/clang/10.0.0/lib/darwin || true
sudo ln -s ${EHOME}/cross/${NAME}/darwin /usr/lib/llvm-10/lib/clang/10.0.0/lib/. sudo ln -s ${EHOME}/cross/${NAME}/darwin /usr/lib/llvm-10/lib/clang/10.0.0/lib/.
;; ;;