upgrade to 17.1.1.593

2 files changed, 31 insertions, 49 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 802400e428be..085485db5ff4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,39 +17,25 @@ license=('custom')
 
 _alteradir="/opt/altera"
 
-# According to the installer script, these dependencies are needed for the installer
-if [[ $CARCH = i686 ]]
-then
-   depends=('desktop-file-utils' 'expat' 'fontconfig' 'freetype2'
-   'glibc' 'gtk2' 'libcanberra' 'libpng' 'libpng12' 'libice' 'libsm'
-   'util-linux' 'ncurses' 'tcl' 'tcllib' 'zlib' 'libx11' 'libxau'
-   'libxdmcp' 'libxext' 'libxft' 'libxrender' 'libxt' 'libxtst')
-fi
-
-if [[ $CARCH = x86_64 ]]
-then
-   depends=('desktop-file-utils' 'expat' 'fontconfig' 'freetype2'
-   'glibc' 'gtk2' 'libcanberra' 'libpng' 'libpng12' 'libice' 'libsm'
-   'util-linux' 'ncurses' 'tcl' 'tcllib' 'zlib' 'libx11' 'libxau'
-   'libxdmcp' 'libxext' 'libxft' 'libxrender' 'libxt' 'libxtst'
-
-   'lib32-expat' 'lib32-fontconfig' 'lib32-freetype2' 'lib32-glibc'
-   'lib32-gtk2' 'lib32-libcanberra' 'lib32-libpng' 'lib32-libpng12'
-   'lib32-libice' 'lib32-libsm' 'lib32-util-linux' 'lib32-ncurses'
-   'lib32-zlib' 'lib32-libx11' 'lib32-libxau' 'lib32-libxdmcp'
-   'lib32-libxext' 'lib32-libxft' 'lib32-libxrender' 'lib32-libxt'
-   'lib32-libxtst')
-fi
+depends=('desktop-file-utils' 'expat' 'fontconfig' 'freetype2'
+'glibc' 'gtk2' 'libcanberra' 'libpng' 'libpng12' 'libice' 'libsm'
+'util-linux' 'ncurses' 'tcl' 'tcllib' 'zlib' 'libx11' 'libxau'
+'libxdmcp' 'libxext' 'libxft' 'libxrender' 'libxt' 'libxtst')
 
 source=("http://download.altera.com/akdlm/software/acdsinst/17.1std.1/593/update/QuartusSetup-${pkgver}-linux.run"
-	"http://download.altera.com/akdlm/software/acdsinst/17.1std/590/ib_installers/QuartusSetup-${_oldver}-linux.run"
-	"quartus.sh" "quartus.desktop" "51-usbblaster.rules" "quartus.install")
-md5sums=('skip'
-         'skip'
-         '067c444cae7fe31d3608245712b43ce8'
-         '32b17cb8b992fc2dccd33d87f0dcd8ce'
-         'f5744dc4820725b93917e3a24df13da9'
-         'a331a81c44aed062a7af6d28542c3d82')
+        "http://download.altera.com/akdlm/software/acdsinst/17.1std/590/ib_installers/QuartusSetup-${_oldver}-linux.run"
+        "QuartusWrapper-${pkgver}-linux.run"
+        "quartus.sh"
+        "quartus.desktop"
+        "51-usbblaster.rules"
+        "quartus.install")
+sha256sums=('5a6a98b61b054bb2116be36afd53aa67e67684a0017adfca0e1a9b96ef0069da'
+            '2f05a82bc996a9fa160f4dc42ea9afd047d7b1535589e4687681a611319eb44d'
+            'cdaacc5198bb3af03cdf831c4734effa6ae0eac6f14971388a808ce701db1c26'    
+            '849dd042a6173bb4f97a9522b51935bd3069a3313fe963ae19dcf4c25331b291'
+            'eade659fda0db843a5b287502415c698c4f251f3b721836e2a56911896fc2371'
+            'dd9d33fa2698a0ec11ae86f4508f77e2e12bf4a21224f5b16640bc41d6c0999b'
+            '0e815b138bcec2d1f9c6aa498d2f56cc131417119af19016a2019173da526d9b')
 
 options=(!strip !upx) # Stripping and UPX will takes ages, I'd avoid it.
 install='quartus.install'
@@ -58,25 +44,22 @@ PKGEXT=".pkg.tar" # Do not compress
 package() {
     cd "${srcdir}"
 
-    # TODO: Make bogus $DISPLAY
     chmod a+x "QuartusSetup-${_oldver}-linux.run"
     chmod a+x "QuartusSetup-${pkgver}-linux.run"
-    echo "installing the base of ${_oldver}"
-    DISPLAY="" ./"QuartusSetup-${_oldver}-linux.run" --mode unattended --unattendedmodeui none --installdir "${pkgdir}/${_alteradir}"
-    cat <<EOF
-Due to some technical limits, the update has to be installed with manual intervention.
-In the following installation guide:
-- say no when asked of "Allow patches to be uninstalled", if ever asked
-- when asked of "the installation to update", use the following path: 
+    chmod a+x "QuartusWrapper-${pkgver}-linux.run"
 
-${pkgdir}/${_alteradir}
-
-You should copy it elsewhere NOW as the installation will flush the console.
-EOF
-    read -p "Press enter to continue"
-    echo "launching the installer"
-    ./"QuartusSetup-${pkgver}-linux.run"
+    # switch two files
+    mv "QuartusSetup-${pkgver}-linux.run" "temp"
+    mv "QuartusWrapper-${pkgver}-linux.run" "QuartusSetup-${pkgver}-linux.run"
+    mv "temp" "QuartusWrapper-${pkgver}-linux.run"
 
+    DISPLAY="" ./"QuartusSetup-${_oldver}-linux.run" --accept_eula 1 --mode unattended --unattendedmodeui none --installdir "${pkgdir}${_alteradir}" &>/dev/null & 
+    
+    while [ ! -d "${pkgdir}${_alteradir}/logs" ]; do
+        sleep 10
+    done
+    killall QuartusSetup-${_oldver}-linux.run
+    
     # Remove uninstaller and install logs since we have a working package management
     rm -r "${pkgdir}${_alteradir}/uninstall"
     rm -r "${pkgdir}${_alteradir}/logs"
@@ -86,12 +69,10 @@ EOF
     sed -i.bak "s,_alteradir,$_alteradir,g" quartus.desktop
 
     # Copy license file
-    install -D -m644 "${pkgdir}${_alteradir}/licenses/license.txt" "${pkgdir}/usr/share/licenses/${pkgnam}/eLICENSE"
+    install -D -m644 "${pkgdir}${_alteradir}/licenses/license.txt" "${pkgdir}/usr/share/licenses/${pkgnam}/license.txt"
 
     # Install integration files
     install -D -m755 quartus.sh "${pkgdir}/etc/profile.d/quartus.sh"
     install -D -m644 51-usbblaster.rules "${pkgdir}/etc/udev/rules.d/51-usbblaster.rules"
     install -D -m644 quartus.desktop "${pkgdir}/usr/share/applications/quartus.desktop"
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/QuartusWrapper-17.1.1.593-linux.run b/QuartusWrapper-17.1.1.593-linux.run
new file mode 100755
index 000000000000..b0853eeb5dd7
--- /dev/null
+++ b/QuartusWrapper-17.1.1.593-linux.run
@@ -0,0 +1 @@
+./QuartusWrapper-17.1.1.593-linux.run --accept_eula 1 "$@"
\ No newline at end of file