install-deps.sh: install new gcc as the default the right way

* should install software-properties-common beforehand, otherwise the `add-apt-repository` command will not be available. * the update-alternative commandline were copied from ceph-build, should remove the escape characters. Signed-off-by: Kefu Chai <[email protected]>
blmt · Dec 9, 2017 · 3882dea · 3882dea
1 parent 74a132d
commit 3882dea
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/install-deps.sh b/install-deps.sh
@@ -36,12 +36,12 @@ function ensure_decent_gcc_on_deb {
     fi
 
     $SUDO update-alternatives \
-	 --install /usr/bin/gcc gcc /usr/bin/gcc-\${new} 20 \
-	 --slave   /usr/bin/g++ g++ /usr/bin/g++-\${new}
+	 --install /usr/bin/gcc gcc /usr/bin/gcc-${new} 20 \
+	 --slave   /usr/bin/g++ g++ /usr/bin/g++-${new}
 
     $SUDO update-alternatives \
-	 --install /usr/bin/gcc gcc /usr/bin/gcc-\${old} 10 \
-	 --slave   /usr/bin/g++ g++ /usr/bin/g++-\${old}
+	 --install /usr/bin/gcc gcc /usr/bin/gcc-${old} 10 \
+	 --slave   /usr/bin/g++ g++ /usr/bin/g++-${old}
 
     $SUDO update-alternatives --auto gcc
 
@@ -140,9 +140,10 @@ else
         $SUDO apt-get install -y dpkg-dev
         case "$VERSION" in
             *Trusty*)
+                $SUDO apt-get install -y software-properties-common
                 $SUDO add-apt-repository ppa:ubuntu-toolchain-r/test
                 $SUDO apt-get update
-                $SUDO apt-get install -y gcc-7
+                $SUDO apt-get install -y g++-7
                 ensure_decent_gcc_on_deb 7
                 ;;
             *)