Merge pull request #7 from uyjulian/cleanup1

General cleanup 1

Author: fjtrujy

.github/workflows/docker.yml

@@ -10,6 +10,10 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    env:
+      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+      DISPATCH_TOKEN: ${{ secrets.DISPATCH_TOKEN }}
 
     steps:
     - uses: actions/checkout@v2
@@ -32,11 +36,13 @@ jobs:
 
     - name: Login to DockerHub
       uses: docker/login-action@v1
+      if: env.DOCKER_USERNAME != null
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
 
     - uses: docker/build-push-action@v2
+      if: env.DOCKER_USERNAME != null
       with:
         push: true
         tags: ${{ github.repository }}:${{ env.DOCKER_TAG }}
@@ -48,6 +54,7 @@ jobs:
 
     - name: Repository Dispatch
       uses: peter-evans/repository-dispatch@v1
+      if: env.DISPATCH_TOKEN != null
       with:
         repository: ${{ github.repository_owner }}/ps2toolchain
         token: ${{ secrets.DISPATCH_TOKEN }}

README.md

@@ -3,34 +3,29 @@
 
 # ps2toolchain-dvp
 
-This program will automatically build and install a DVP compiler which is used in the creation of homebrew software for the Sony PlayStation® 2 videogame system.
+This program will automatically build and install a DVP compiler, which is used in the creation of homebrew software for the Sony PlayStation® 2 videogame system.
 
-## **ATENTION!**
+## **ATTENTION**
 
-If you're trying to install in your machine the **WHOLE PS2 Development Environment** this is **NOT** the repo to use, you should use instead the [ps2dev](https://github.com/ps2dev/ps2dev "ps2dev") repo.
+If you're trying to install in your machine the **WHOLE PS2 Development Environment**, this is **NOT** the repo to use! Instead, you should use instead the [ps2dev](https://github.com/ps2dev/ps2dev "ps2dev") repo.
 
 ## What these scripts do
 
-These scripts download (with wget) and install [binutils 2.14](http://www.gnu.org/software/binutils/ "binutils") (dvp).
+These scripts download (with `git clone`) and install [binutils 2.14](http://www.gnu.org/software/binutils/ "binutils") (dvp).
 
 ## Requirements
 
-1.  Install gcc/clang, make, patch, git, texinfo and wget 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 its path! For example, on Linux systems you can set access for the current user by running commands:
-
+1.  Install gcc/clang, make, patch, git, and texinfo if you don't have those packages.
+2.  Ensure that you have enough permissions for managing PS2DEV location (which defaults to `/usr/local/ps2dev`). PS2DEV location MUST NOT have spaces or special characters in its path! For example, on Linux systems, you can set access for the 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`)
-
 ```bash
 export PS2DEV=/usr/local/ps2dev
 export PATH=$PATH:$PS2DEV/dvp/bin
 ```
-
 4.  Run toolchain.sh
     `./toolchain.sh`

scripts/001-binutils.sh

@@ -1,18 +1,27 @@
 #!/bin/bash
 # binutils-2.14.sh by Francisco Javier Trujillo Mata ([email protected])
 
+## Exit with code 1 when any command executed returns a non-zero exit code.
+onerr()
+{
+  exit 1;
+}
+trap onerr ERR
+
 ## Download the source code.
 REPO_URL="https://github.com/ps2dev/binutils-gdb.git"
 REPO_FOLDER="binutils-gdb"
 BRANCH_NAME="dvp-v2.14"
 if test ! -d "$REPO_FOLDER"; then
-  git clone --depth 1 -b $BRANCH_NAME $REPO_URL && cd "$REPO_FOLDER" || exit 1
+  git clone --depth 1 -b "$BRANCH_NAME" "$REPO_URL"
 else
-  cd "$REPO_FOLDER" && git fetch origin && git reset --hard "origin/${BRANCH_NAME}" && git checkout "$BRANCH_NAME" || exit 1
+  git -C "$REPO_FOLDER" fetch origin
+  git -C "$REPO_FOLDER" reset --hard "origin/${BRANCH_NAME}"
+  git -C "$REPO_FOLDER" checkout "$BRANCH_NAME"
 fi
+cd "$REPO_FOLDER"
 
 TARGET_ALIAS="dvp"
-TARGET="dvp"
 TARG_XTRA_OPTS=""
 OSVER=$(uname)
 
@@ -31,23 +40,29 @@ fi
 ## Determine the maximum number of processes that Make can work with.
 PROC_NR=$(getconf _NPROCESSORS_ONLN)
 
-## Create and enter the toolchain/build directory
-rm -rf build-$TARGET && mkdir build-$TARGET && cd build-$TARGET || { exit 1; }
-
-## Configure the build.
-../configure \
-  --quiet \
-  --prefix="$PS2DEV/$TARGET_ALIAS" \
-  --target="$TARGET" \
-  --disable-nls \
-  --disable-build-warnings \
-  $TARG_XTRA_OPTS || { exit 1; }
-
-## Compile and install.
-make --quiet -j $PROC_NR clean          || { exit 1; }
-make --quiet -j $PROC_NR CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=0 -O2 -Wno-implicit-function-declaration" LDFLAGS="$LDFLAGS -s" || { exit 1; }
-make --quiet -j $PROC_NR install        || { exit 1; }
-make --quiet -j $PROC_NR clean          || { exit 1; }
-
-## Exit the build directory.
-cd .. || { exit 1; }
+## For each target...
+for TARGET in "dvp"; do
+  ## Create and enter the toolchain/build directory
+  rm -rf "build-$TARGET"
+  mkdir "build-$TARGET"
+  cd "build-$TARGET"
+
+  ## Configure the build.
+  ../configure \
+    --quiet \
+    --prefix="$PS2DEV/$TARGET_ALIAS" \
+    --target="$TARGET" \
+    --disable-nls \
+    --disable-build-warnings \
+    $TARG_XTRA_OPTS
+
+  ## Compile and install.
+  make --quiet -j "$PROC_NR" CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=0 -O2 -Wno-implicit-function-declaration" LDFLAGS="$LDFLAGS -s"
+  make --quiet -j "$PROC_NR" install
+  make --quiet -j "$PROC_NR" clean
+
+  ## Exit the build directory.
+  cd ..
+
+  ## End target.
+done