X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/9de50d82825d9e66805081805ec8bb6088095f3b..e17437f985b1c955b3a2e3cab4f9146db54631a1:/tools/install-gnuarm4.sh

diff --git a/tools/install-gnuarm4.sh b/tools/install-gnuarm4.sh
index 59fdd959..793bdbf5 100755
--- a/tools/install-gnuarm4.sh
+++ b/tools/install-gnuarm4.sh
@@ -50,7 +50,7 @@ GNU_KEYRING_GPG=gnu-keyring.gpg
 GNU_KEYRING=ftp://ftp.gnu.org/gnu/${GNU_KEYRING_GPG}
 
 # Common configuration options (i.e., things to pass to 'configure')
-COMMON_CFG="--enable-interwork --target=arm-eabi --program-prefix=arm-eabi- --prefix=${DESTDIR} --disable-werror --enable-languages=c,c++ --enable-multilib --disable-shared"
+COMMON_CFG="--enable-interwork --target=arm-eabi --program-prefix=arm-none-eabi- --prefix=${DESTDIR} --disable-werror --enable-languages=c,c++ --enable-multilib --disable-shared"
 
 # Extra configuration options for each toolchain component
 BINUTILS_CFG=
@@ -74,11 +74,14 @@ WGET_OPTS="-c -t 0"
 # Compiler flags for compiling Newlib (-O2 is already hard-coded)
 NEWLIB_FLAGS="-march=armv4t -mcpu=arm7tdmi -g"
 
+# GPG options to avoid polluting the user's keyring
+GPG_OPTS="--keyring ${GNU_KEYRING_GPG} --no-default-keyring --homedir ."
+
 ############################################################################
 # End of configuration section. You shouldn't have to modify anything below.
 ############################################################################
 
-if [[ `whoami` != "root" ]]; then
+if [[ "$USER" != "root" ]]; then
   echo "*** Warning! Not running as root!"
   echo "Installation may fail if you do not have appropriate permissions!"
 fi
@@ -90,76 +93,38 @@ if [[ -f all.downloaded ]]; then
   echo Looks like all downloads are complete, skipping downloads
 else
   wget ${WGET_OPTS} ${GNU_KEYRING}
-  # TODO: need to avoid polluting the users keyring, but how?!
-  gpg --import ${GNU_KEYRING_GPG}
 
   # TODO: guess it's better to have a function that "downloads, checks file-presence and signature, and returns true/false" whether the file is ok
   # Function will check if file exists (otherwise try to download the file - if failed and file still doesn't exist, complain and exit the script)
   # Check if signature file exists (otherwise download the signature file as well - if download fail, warn the user and return function)
   # Check the signature. If failed, backup-by-renaming current files, redownload both file & signature, run the function body one more time - if still no success, warn and return from function
 
-  # NOTE: If new downloads are added here, please see the IMPORTANT note below
-  echo Now downloading BINUTILS...
-  wget ${WGET_OPTS} ${BINUTILS}
-  wget -N ${WGET_OPTS} ${BINUTILS}.sig
-  gpg --verify ${BINUTILS_TAR}.sig 2> /dev/null
-  if [[ $? != 0 ]]; then
-    echo "Failed signature check for:" ${BINUTILS_TAR}.sig
-    exit 1
-  fi
+  function download_lib {
+    echo Now downloading $1
+    wget ${WGET_OPTS} $2
+  }
+
+  function download_signed_lib {
+    download_lib $1 $2
+    wget -N ${WGET_OPTS} $2.sig
+    gpg $GPG_OPTS --verify $3.sig 2> /dev/null
+    if [[ $? != 0 ]]; then
+      echo "Failed signature check for:" $3.sig
+      exit 1
+    fi
+  }
 
-  echo Now downloading GCC...
-  wget ${WGET_OPTS} ${GCCCORE}
-  wget -N ${WGET_OPTS} ${GCCCORE}.sig
-  gpg --verify ${GCCCORE_TAR}.sig 2> /dev/null
-  if [[ $? != 0 ]]; then
-    echo "Failed signature check for:" ${GCCCORE_TAR}.sig
-    exit 1
-  fi
-
-  echo Now downloading G++...
-  wget ${WGET_OPTS} ${GPP}
-  wget -N ${WGET_OPTS} ${GPP}.sig
-  gpg --verify ${GPP_TAR}.sig 2> /dev/null
-  if [[ $? != 0 ]]; then
-    echo "Failed signature check for:" ${GPP_TAR}.sig
-    exit 1
-  fi
-
-  echo Now downloading NEWLIB...
-  wget ${WGET_OPTS} ${NEWLIB}
+  # NOTE: If new downloads are added here, please see the IMPORTANT note below
+  download_signed_lib BINUTILS ${BINUTILS} ${BINUTILS_TAR} || exit 1
+  download_signed_lib GCC ${GCCCORE} ${GCCCORE_TAR} || exit 1
+  download_signed_lib G++ ${GPP} ${GPP_TAR} || exit 1
+  download_lib NEWLIB ${NEWLIB}
   # TODO: signature/hash check
-
-  echo Now downloading INSIGHT...
-  wget ${WGET_OPTS} ${INSIGHT}
+  download_lib INSIGHT ${INSIGHT}
   # TODO: signature/hash check
-
-  echo Now downloading GDB...
-  wget ${WGET_OPTS} ${GDB}
-  wget -N ${WGET_OPTS} ${GDB}.sig
-  gpg --verify ${GDB_TAR}.sig 2> /dev/null
-  if [[ $? != 0 ]]; then
-    echo "Failed signature check for:" ${GDB_TAR}.sig
-    exit 1
-  fi
-
-  echo Now downloading GMP...
-  wget ${WGET_OPTS} ${GMP}
-  wget -N ${WGET_OPTS} ${GMP}.sig
-  gpg --verify ${GMP_TAR}.sig 2> /dev/null
-  if [[ $? != 0 ]]; then
-    echo "Failed signature check for:" ${GMP_TAR}.sig
-    exit 1
-  fi
-
-  echo Now downloading MPFR...
-  wget ${WGET_OPTS} ${MPFR}
-  wget -N ${WGET_OPTS} ${MPFR}.sig
-  gpg --verify ${MPFR_TAR}.sig 2> /dev/null
-  if [[ $? != 0 ]]; then
-    echo "Failed signature check for:" ${MPFR_TAR}.sig
-    exit 1
-  fi
+  download_signed_lib GDB ${GDB} ${GDB_TAR} || exit 1
+  download_signed_lib GMP ${GMP} ${GMP_TAR} || exit 1
+  download_signed_lib MPFR ${MPFR} ${MPFR_TAR} || exit 1
 
   # IMPORTANT: Here is the number of .tar. archives downloaded above. Please update if new .tar. are added to download list.
   if [[ `ls -1 *.tar.bz2 *.tar.gz | wc -l` != 8 ]]; then
@@ -308,5 +273,5 @@ chmod -R a+rX .
 
 echo Downloaded archives are in ${SRCDIR}
 echo build driectory: ${BUILDDIR}
-echo set environment variable ARMLIB to ${DESTDIR}/lib/gcc/arm-elf/4.3.3/interwork for Makefile.linux
+echo set environment variable ARMLIB to ${DESTDIR}/lib/gcc/arm-eabi/4.3.3/interwork for Makefile.linux
 exit 0