[fix] Do not add the toolchain to the $PATH anymore.

      Notify the user about this.

5 files changed, 12 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 59e6a4bb92e8..5951c0722e04 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = devkitppc-bin
 	pkgdesc = PowerPC toolchain for Nintendo Gamecube/Wii/Wii U homebrew development (precompiled)
 	pkgver = r29.1
-	pkgrel = 2
+	pkgrel = 3
 	url = http://devkitpro.org
 	install = devkitppc.install
 	arch = i686
@@ -19,8 +19,8 @@ pkgbase = devkitppc-bin
 	options = emptydirs
 	source = devkitppc.sh
 	source = devkitppc.fish
-	sha256sums = 3e7ab84e123f76c65a92c27932b4f80df598b9da6b0f44745d8d465120449d1d
-	sha256sums = ab0c74e766fab7ada98541c530593b9f717a72d386f9bb9dad2779a080c66b9d
+	sha256sums = 69755d0b77c0c3233dee9255a5d897710410be18b9dcdfb8d9d6b18c6945ae34
+	sha256sums = 135a9cbe1fc28c96c2ce38b19cd305857ce49ed56e35bfb5bd96638a51c3ec6f
 	source_i686 = https://github.com/devkitPro/buildscripts/releases/download/devkitPPC_r29-1/devkitPPC_r29-1-i686-linux.tar.bz2
 	sha256sums_i686 = 3683abfbe0b359a209bfcaa7902075232b999aa6f623b0eb17d0d1ceafe09ba9
 	source_x86_64 = https://github.com/devkitPro/buildscripts/releases/download/devkitPPC_r29-1/devkitPPC_r29-1-x86_64-linux.tar.bz2
diff --git a/PKGBUILD b/PKGBUILD
index c038c8a3c861..ecb5bc6d190b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=devkitppc-bin
 pkgver=r29.1
-pkgrel=2
+pkgrel=3
 pkgdesc='PowerPC toolchain for Nintendo Gamecube/Wii/Wii U homebrew development (precompiled)'
 arch=('i686' 'x86_64')
 url="http://devkitpro.org"
@@ -22,8 +22,8 @@ source=("devkitppc.sh"
         "devkitppc.fish")
 source_i686=("https://github.com/devkitPro/buildscripts/releases/download/devkitPPC_${pkgver/./-}/devkitPPC_${pkgver/./-}-i686-linux.tar.bz2")
 source_x86_64=("https://github.com/devkitPro/buildscripts/releases/download/devkitPPC_${pkgver/./-}/devkitPPC_${pkgver/./-}-x86_64-linux.tar.bz2")
-sha256sums=('3e7ab84e123f76c65a92c27932b4f80df598b9da6b0f44745d8d465120449d1d'
-            'ab0c74e766fab7ada98541c530593b9f717a72d386f9bb9dad2779a080c66b9d')
+sha256sums=('69755d0b77c0c3233dee9255a5d897710410be18b9dcdfb8d9d6b18c6945ae34'
+            '135a9cbe1fc28c96c2ce38b19cd305857ce49ed56e35bfb5bd96638a51c3ec6f')
 sha256sums_i686=('3683abfbe0b359a209bfcaa7902075232b999aa6f623b0eb17d0d1ceafe09ba9')
 sha256sums_x86_64=('fc4e4ce51584b3a50e7a658f4234f04fdc9bb2a77db544aaa01678c3a9fa900c')
 
diff --git a/devkitppc.fish b/devkitppc.fish
index 92fda327b587..abb69a17c6b5 100644
--- a/devkitppc.fish
+++ b/devkitppc.fish
@@ -1,6 +1,3 @@
 # set needed variables
 set -gx DEVKITPRO /opt/devkitpro
 set -gx DEVKITPPC $DEVKITPRO/devkitPPC
-
-# add to path
-set -gx PATH $PATH $DEVKITPPC/bin
diff --git a/devkitppc.install b/devkitppc.install
index 3c3ce092dda1..ca5a4182e0ee 100644
--- a/devkitppc.install
+++ b/devkitppc.install
@@ -6,8 +6,14 @@ post_install() {
   echo "To use the toolchain right away, use"
   echo "  $ source /etc/profile.d/devkitppc.sh     # (for POSIX compatible)"
   echo "  $ source /etc/fish/conf.d/devkitppc.fish # (for fish shell)"
+  echo "You may add \$DEVKITPPC/bin to your \$PATH for selected shells."
 }
 
 post_upgrade() {
   post_install
+
+  if [[ $(vercmp "$2" "r29.1-2") -ne 1 && $(vercmp "r29.1-3" "$1") -ne 1 ]]; then
+    echo "Note: The provided tools are not added to the \$PATH automatically anymore."
+    echo "  This caused problems with other toolchains using the same executable names."
+  fi
 }
diff --git a/devkitppc.sh b/devkitppc.sh
index a4ae1d95e887..f2a9f2db54bf 100644
--- a/devkitppc.sh
+++ b/devkitppc.sh
@@ -1,6 +1,3 @@
 # set needed variables
 export DEVKITPRO=/opt/devkitpro
 export DEVKITPPC=${DEVKITPRO}/devkitPPC
-
-# add to path
-export PATH=${PATH}:${DEVKITPPC}/bin