Fixed scripts not producing failing code

Fixed scripts to handle complex paths and tags
Various cleanups

Author: AKuHAK

.github/workflows/compilation.yml

@@ -18,13 +18,13 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    
+
     - name: Install Ubuntu texinfo bison flex
       if: matrix.os[0] == 'ubuntu-latest'
       run: |
         sudo apt-get update
         sudo apt-get -y install texinfo bison flex gettext libgmp3-dev libmpfr-dev libmpc-dev
-    
+
     - name: Install Mac texinfo bison flex
       if: matrix.os[0] == 'macOS-latest'
       run: |

.github/workflows/docker.yml

@@ -12,32 +12,32 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-  
+
     steps:
     - uses: actions/checkout@v2
 
     - name: Extract DOCKER_TAG using tag name
       if: startsWith(github.ref, 'refs/tags/')
       run: |
         echo "DOCKER_TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
-    
+
     - name: Use default DOCKER_TAG
       if: startsWith(github.ref, 'refs/tags/') != true
       run: |
         echo "DOCKER_TAG=latest" >> $GITHUB_ENV
 
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v1
-      
+
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v1
-      
+
     - name: Login to DockerHub
-      uses: docker/login-action@v1 
+      uses: docker/login-action@v1
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
-    
+
     - uses: docker/build-push-action@v2
       with:
         push: true
@@ -46,7 +46,7 @@ jobs:
           BASE_DOCKER_DVP_IMAGE=${{ github.repository_owner }}/ps2toolchain-dvp:${{ env.DOCKER_TAG }}
           BASE_DOCKER_IOP_IMAGE=${{ github.repository_owner }}/ps2toolchain-iop:${{ env.DOCKER_TAG }}
           BASE_DOCKER_EE_IMAGE=${{ github.repository_owner }}/ps2toolchain-ee:${{ env.DOCKER_TAG }}
-    
+
     - name: Send Compile action
       run: |
         export DISPATCH_ACTION="$(echo run_build)"
@@ -58,4 +58,4 @@ jobs:
         repository: ${{ github.repository_owner }}/ps2sdk
         token: ${{ secrets.DISPATCH_TOKEN }}
         event-type: ${{ env.NEW_DISPATCH_ACTION }}
-        client-payload: '{"ref": "${{ github.ref }}"}'
+        client-payload: '{"ref": "${{ github.ref }}"}'

.gitignore

@@ -1,2 +1,18 @@
+#
+# NOTE! Please use 'git ls-files -i --exclude-standard -c'
+# command after changing this file, to see if there are
+# any tracked files which get ignored after the change.
+#
+# Normal rules
+#
 build/
-.DS_Store
+.*
+
+#
+# files that we don't want to ignore
+#
+!.gitignore
+!.gitattributes
+!.github
+!.editorconfig
+!.clang-format

README.md

@@ -12,29 +12,32 @@ If you're trying to install in your machine the **WHOLE PS2 Development Environm
 ## What these scripts do
 
 These scripts download (with `wget`/`git clone`) and install:
-- [binutils 2.14](http://www.gnu.org/software/binutils/ "binutils") (iop, dvp)
-- [binutils 2.35.1](http://www.gnu.org/software/binutils/ "binutils") (ee), 
-- [gcc 3.2.3](https://gcc.gnu.org/ "gcc") (iop)
-- [gcc 10.2.0](https://gcc.gnu.org/ "gcc") (ee)
-- [newlib 4.0.0](https://sourceware.org/newlib/ "newlib") (ee)
+
+-   [binutils 2.14](http://www.gnu.org/software/binutils/ "binutils") (iop, dvp)
+-   [binutils 2.35.1](http://www.gnu.org/software/binutils/ "binutils") (ee),
+-   [gcc 3.2.3](https://gcc.gnu.org/ "gcc") (iop)
+-   [gcc 10.2.0](https://gcc.gnu.org/ "gcc") (ee)
+-   [newlib 4.0.0](https://sourceware.org/newlib/ "newlib") (ee)
 
 ## Requirements
 
-1. Install gcc/clang, make, patch, git, texinfo, flex, bison, wget, gsl, gmp, mpfr, mpc and gettext if you don't have those.
+1.  Install gcc/clang, make, patch, git, texinfo, flex, bison, wget, gsl, gmp, mpfr, mpc and gettext if you don't have those.
+
+2.  Ensure that you have enough permissions for managing PS2DEV location (default to `/usr/local/ps2dev`). PS2DEV location MUST NOT have spaces or special characters in it's path! For example on Linux systems you can set access for current user by running commands:
 
-2. Ensure that you have enough permissions for managing PS2DEV location (default to `/usr/local/ps2dev`). PS2DEV location MUST NOT have spaces or special characters in it's path! For example on Linux systems you can set access for current user by running commands:
 ```bash
 export PS2DEV=/usr/local/ps2dev
 sudo mkdir -p $PS2DEV
 sudo chown -R $USER: $PS2DEV
 ```
 
-3. Add this to your login script (example: `~/.bash_profile`)  
+3.  Add this to your login script (example: `~/.bash_profile`)
+
 ```bash
 export PS2DEV=/usr/local/ps2dev
 export PS2SDK=$PS2DEV/ps2sdk
 export PATH=$PATH:$PS2DEV/bin:$PS2DEV/ee/bin:$PS2DEV/iop/bin:$PS2DEV/dvp/bin:$PS2SDK/bin
 ```
 
-4. Run toolchain.sh  
-`./toolchain.sh`
+4.  Run toolchain.sh
+    `./toolchain.sh`

depends/check-texinfo.sh

@@ -2,4 +2,4 @@
 # check-texinfo.sh by Dan Peori ([email protected])
 
 ## Check for texinfo.
-makeinfo --version 1> /dev/null || { echo "ERROR: Install texinfo before continuing."; exit 1; }
+makeinfo --version 1> /dev/null || { echo "ERROR: Install texinfo before continuing."; exit 1; }

scripts/001-dvp.sh

@@ -6,13 +6,13 @@ REPO_URL="https://github.com/ps2dev/ps2toolchain-dvp"
 REPO_FOLDER="ps2toolchain-dvp"
 
 # Checking if a specific TAG has been selected, it is passed using parameter $1
-[  -z "$1" ] && REPO_REFERENCE="origin/main" || REPO_REFERENCE=$1
+[  -z "$1" ] && REPO_REFERENCE="main" || REPO_REFERENCE=$1
 echo "Using repo reference $REPO_REFERENCE"
 
 if test ! -d "$REPO_FOLDER"; then
-	git clone $REPO_URL|| exit 1
+  git clone $REPO_URL -b "${REPO_REFERENCE}" || exit 1
 fi
-cd $REPO_FOLDER && git fetch origin && git reset --hard ${REPO_REFERENCE} || exit 1
+cd "$REPO_FOLDER" && git fetch origin && git reset --hard "origin/${REPO_REFERENCE}" && git checkout "${REPO_REFERENCE}" || exit 1
 
-## Build and install
-./toolchain.sh
+## Build and install.
+./toolchain.sh || { exit 1; }

scripts/002-iop.sh

@@ -6,13 +6,13 @@ REPO_URL="https://github.com/ps2dev/ps2toolchain-iop"
 REPO_FOLDER="ps2toolchain-iop"
 
 # Checking if a specific TAG has been selected, it is passed using parameter $1
-[  -z "$1" ] && REPO_REFERENCE="origin/main" || REPO_REFERENCE=$1
+[  -z "$1" ] && REPO_REFERENCE="main" || REPO_REFERENCE=$1
 echo "Using repo reference $REPO_REFERENCE"
 
 if test ! -d "$REPO_FOLDER"; then
-	git clone $REPO_URL|| exit 1
+  git clone $REPO_URL -b "${REPO_REFERENCE}" || exit 1
 fi
-cd $REPO_FOLDER && git fetch origin && git reset --hard ${REPO_REFERENCE} || exit 1
+cd "$REPO_FOLDER" && git fetch origin && git reset --hard "origin/${REPO_REFERENCE}" && git checkout "${REPO_REFERENCE}" || exit 1
 
-## Build and install
-./toolchain.sh
+## Build and install.
+./toolchain.sh || { exit 1; }

scripts/003-ee.sh

@@ -6,13 +6,13 @@ REPO_URL="https://github.com/ps2dev/ps2toolchain-ee"
 REPO_FOLDER="ps2toolchain-ee"
 
 # Checking if a specific TAG has been selected, it is passed using parameter $1
-[  -z "$1" ] && REPO_REFERENCE="origin/main" || REPO_REFERENCE=$1
+[  -z "$1" ] && REPO_REFERENCE="main" || REPO_REFERENCE=$1
 echo "Using repo reference $REPO_REFERENCE"
 
 if test ! -d "$REPO_FOLDER"; then
-	git clone $REPO_URL|| exit 1
+  git clone $REPO_URL -b "${REPO_REFERENCE}" || exit 1
 fi
-cd $REPO_FOLDER && git fetch origin && git reset --hard ${REPO_REFERENCE} || exit 1
+cd "$REPO_FOLDER" && git fetch origin && git reset --hard "origin/${REPO_REFERENCE}" && git checkout "${REPO_REFERENCE}" || exit 1
 
-## Build and install
-./toolchain.sh
+## Build and install.
+./toolchain.sh || { exit 1; }

toolchain-sudo.sh

@@ -2,7 +2,7 @@
 # toolchain-sudo.sh by Naomi Peori ([email protected])
 
 ## Enter the ps2toolchain directory.
-cd "`dirname $0`" || { echo "ERROR: Could not enter the ps2toolchain directory."; exit 1; }
+cd "$(dirname "$0")" || { echo "ERROR: Could not enter the ps2toolchain directory."; exit 1; }
 
 ## Set up the environment.
 export PS2DEV=/usr/local/ps2dev
@@ -14,4 +14,4 @@ export PATH=$PATH:$PS2DEV/dvp/bin
 export PATH=$PATH:$PS2SDK/bin
 
 ## Run the toolchain script.
-./toolchain.sh $@ || { echo "ERROR: Could not run the toolchain script."; exit 1; }
+./toolchain.sh "$@" || { echo "ERROR: Could not run the toolchain script."; exit 1; }

toolchain.sh

@@ -2,7 +2,7 @@
 # toolchain.sh by Naomi Peori ([email protected])
 
 ## Enter the ps2toolchain directory.
-cd "`dirname $0`" || { echo "ERROR: Could not enter the ps2toolchain directory."; exit 1; }
+cd "$(dirname "$0")" || { echo "ERROR: Could not enter the ps2toolchain directory."; exit 1; }
 
 ## Create the build directory.
 mkdir -p build || { echo "ERROR: Could not create the build directory."; exit 1; }
@@ -11,7 +11,7 @@ mkdir -p build || { echo "ERROR: Could not create the build directory."; exit 1;
 cd build || { echo "ERROR: Could not enter the build directory."; exit 1; }
 
 ## Fetch the depend scripts.
-DEPEND_SCRIPTS=(`ls ../depends/*.sh | sort`)
+DEPEND_SCRIPTS=$(ls ../depends/*.sh | sort)
 
 ## Run all the depend scripts.
 for SCRIPT in ${DEPEND_SCRIPTS[@]}; do "$SCRIPT" || { echo "$SCRIPT: Failed."; exit 1; } done
@@ -26,17 +26,17 @@ else
 fi
 
 ## Fetch the build scripts.
-BUILD_SCRIPTS=(`ls ../scripts/*.sh | sort`)
+BUILD_SCRIPTS=$(ls ../scripts/*.sh | sort)
 
 ## If specific steps were requested...
-if [ $1 ]; then
+if [ "$1" ]; then
 
-	## Run the requested build scripts.
-	for STEP in $@; do "${BUILD_SCRIPTS[$STEP-1]}" $TAG || { echo "${BUILD_SCRIPTS[$STEP-1]}: Failed."; exit 1; } done
+  ## Run the requested build scripts.
+  for STEP in "$@"; do "${BUILD_SCRIPTS[$STEP-1]}" "$TAG" || { echo "${BUILD_SCRIPTS[$STEP-1]}: Failed."; exit 1; } done
 
 else
 
-	## Run the all build scripts.
-	for SCRIPT in ${BUILD_SCRIPTS[@]}; do "$SCRIPT" $TAG || { echo "$SCRIPT: Failed."; exit 1; } done
+  ## Run the all build scripts.
+  for SCRIPT in ${BUILD_SCRIPTS[@]}; do "$SCRIPT" "$TAG" || { echo "$SCRIPT: Failed."; exit 1; } done
 
 fi