x86/Intel: drop pointless suffix setting for "fword ptr"

[deliverable/binutils-gdb.git] / gdb / contrib / ari / create-web-ari-in-src.sh

diff --git a/gdb/contrib/ari/create-web-ari-in-src.sh b/gdb/contrib/ari/create-web-ari-in-src.sh
index fe9155b005b1e4371d61f7ae55cf5e0ea77c0a89..7721181d83c1350450f392497ea1c256b5b8b603 100644 (file)
--- a/gdb/contrib/ari/create-web-ari-in-src.sh
+++ b/gdb/contrib/ari/create-web-ari-in-src.sh
@@ -2,7 +2,7 @@
 
 # GDB script to create web ARI page directly from within gdb/ari directory.
 #
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2012-2019 Free Software Foundation, Inc.
 #
 # This file is part of GDB.
 #
@@ -55,6 +55,11 @@ if [ -z "${webdir}" ] ; then
 # Use 'branch' subdir name if Tag contains branch
   if [ -f "${srcdir}/gdb/CVS/Tag" ] ; then
     tagname=`cat "${srcdir}/gdb/CVS/Tag"`
+  elif [ -d "${srcdir}/.git" ] ; then
+    tagname=`cd ${srcdir} && git rev-parse --abbrev-ref HEAD`
+    if test "$tagname" = "master"; then
+      tagname=trunk
+    fi
   else
     tagname=trunk
   fi
@@ -67,7 +72,7 @@ if [ -z "${webdir}" ] ; then
 fi
 
 # Launch update-web-ari.sh in same directory as current script.
-${scriptpath}/update-web-ari.sh ${srcdir} ${tempdir} ${webdir} gdb
+${SHELL} ${scriptpath}/update-web-ari.sh ${srcdir} ${tempdir} ${webdir} gdb
 
 if [ -f "${webdir}/index.html" ] ; then
   echo "ARI output can be viewed in file \"${webdir}/index.html\""