Rename Teensyduino files to fix checksum issues

2 files changed, 8 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e9aa2e2336e9..5525ecc43ddf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = teensyduino
 	pkgdesc = Arduino SDK with Teensyduino
 	pkgver = 1.46
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.pjrc.com/teensy/teensyduino.html
 	install = teensyduino.install
 	arch = i686
@@ -35,11 +35,11 @@ pkgbase = teensyduino
 	sha256sums = 031de0b26991b5a3b19c497d9c0a17f86c40c55d925b9d07d19ab89f2286469d
 	sha256sums = 25980feb5927b8bea8b8e999f5002e110825b1bc3d546fa902c2db5c824d33f3
 	source_i686 = http://downloads.arduino.cc/arduino-1.8.9-linux32.tar.xz
-	source_i686 = http://www.pjrc.com/teensy/td_146/TeensyduinoInstall.linux32
+	source_i686 = TeensyduinoInstall_146_i686::http://www.pjrc.com/teensy/td_146/TeensyduinoInstall.linux32
 	sha256sums_i686 = f5cadd3467c183bf6f10bd981a84581fe9861cacfaad951f65f9a6f68c1a8a7e
 	sha256sums_i686 = 5c8e7f4bf66bee803de089628e57f1c406106de28343095da25c14388b6487af
 	source_x86_64 = http://downloads.arduino.cc/arduino-1.8.9-linux64.tar.xz
-	source_x86_64 = http://www.pjrc.com/teensy/td_146/TeensyduinoInstall.linux64
+	source_x86_64 = TeensyduinoInstall_146_x86_64::http://www.pjrc.com/teensy/td_146/TeensyduinoInstall.linux64
 	sha256sums_x86_64 = ea4ea81a9b9b67d6d9eb8d27c34590749f61c45cbb7da223031a6520938d64d3
 	sha256sums_x86_64 = f5e906731f771f97171edfb89299ab1e052f1224c380348db8f019f85e325ac1
 
diff --git a/PKGBUILD b/PKGBUILD
index 0c049951ed16..4846f4a35285 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=teensyduino
 pkgver=1.46
 _pkgver=1.46
 _arduino=1.8.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Arduino SDK with Teensyduino"
 arch=('i686' 'x86_64')
 url="http://www.pjrc.com/teensy/teensyduino.html"
@@ -25,9 +25,9 @@ source=('arduino.xml'
         "http://www.pjrc.com/teensy/49-teensy.rules"
         'LICENSE')
 source_i686+=("http://downloads.arduino.cc/arduino-${_arduino}-linux32.tar.xz"
-              "http://www.pjrc.com/teensy/td_${_pkgver//./}/TeensyduinoInstall.linux32")
+              "TeensyduinoInstall_${_pkgver//./}_i686::http://www.pjrc.com/teensy/td_${_pkgver//./}/TeensyduinoInstall.linux32")
 source_x86_64+=("http://downloads.arduino.cc/arduino-${_arduino}-linux64.tar.xz"
-                "http://www.pjrc.com/teensy/td_${_pkgver//./}/TeensyduinoInstall.linux64")
+                "TeensyduinoInstall_${_pkgver//./}_x86_64::http://www.pjrc.com/teensy/td_${_pkgver//./}/TeensyduinoInstall.linux64")
 sha256sums=('473b82156505e9bd903e4d8484e8d183f2e3bf3c1f7e29940b815929ae597b68'
             '270b55353eb438d3790c7245e5ae16ff8bac9f98cfe927d6c9f2146a34499323'
             'SKIP'
@@ -38,17 +38,11 @@ sha256sums_i686=('f5cadd3467c183bf6f10bd981a84581fe9861cacfaad951f65f9a6f68c1a8a
 sha256sums_x86_64=('ea4ea81a9b9b67d6d9eb8d27c34590749f61c45cbb7da223031a6520938d64d3'
                    'f5e906731f771f97171edfb89299ab1e052f1224c380348db8f019f85e325ac1')
 
-if [ "$CARCH" == 'x86_64' ]; then
-  _bits=64
-elif [ "$CARCH" == 'i686' ]; then
-  _bits=32
-fi
-
 build() {
   msg2 "Installing Teensyduino"
 
-  chmod +x "TeensyduinoInstall.linux${_bits}"
-  ./TeensyduinoInstall.linux${_bits} --dir="${srcdir}/arduino-${_arduino}"
+  chmod +x "TeensyduinoInstall_${_pkgver//./}_${CARCH}"
+  ./TeensyduinoInstall_${_pkgver//./}_${CARCH} --dir="${srcdir}/arduino-${_arduino}"
 
   msg2 "Building Teensy Loader command line"