diff --git a/scripts/indent-c++ b/scripts/indent-c++
index db299d518..5da21f39a 100755
--- a/scripts/indent-c++
+++ b/scripts/indent-c++
@@ -1,15 +1,21 @@
-#!/bin/sh
+#!/bin/bash
 
-# Reindents the C++ source code file given in argument.
+# Reindents the C++ source code files given in argument
 
-if [ -z "$1" ]; then
-    echo "Give a filename in argument"
-    exit 1
-fi
+[[ -n $1 ]] || { echo "Give filename(s) in argument" 2>&1; exit 1; }
 
-SCRIPTS_DIR=$(pwd)/$(dirname $0)
+pushd "$(dirname "$0")" > /dev/null
+SCRIPTS_DIR=$(pwd)
+popd > /dev/null
 
-uncrustify -l CPP --replace -c ${SCRIPTS_DIR}/uncrustify.cfg $1
+for f in "$@"; do
+    echo "*** Indenting $f…"
 
-cd $(dirname $1)
-emacs -batch $(basename $1) -l ${SCRIPTS_DIR}/indent-c++.el
+    uncrustify -l CPP --replace -c "${SCRIPTS_DIR}"/uncrustify.cfg "$f"
+
+    pushd "$(dirname "$f")" > /dev/null
+    emacs -batch "$(basename "$f")" -l "${SCRIPTS_DIR}"/indent-c++.el
+    popd > /dev/null
+
+    echo
+done
diff --git a/scripts/indent-matlab b/scripts/indent-matlab
index 77772bd9a..908e0f075 100755
--- a/scripts/indent-matlab
+++ b/scripts/indent-matlab
@@ -1,13 +1,19 @@
-#!/bin/sh
+#!/bin/bash
 
-# Reindents the MATLAB source code file given in argument.
+# Reindents the MATLAB source code files given in argument
 
-if [ -z "$1" ]; then
-    echo "Give a filename in argument"
-    exit 1
-fi
+[[ -n $1 ]] || { echo "Give filename(s) in argument" 2>&1; exit 1; }
 
-SCRIPTS_DIR=$(pwd)/$(dirname $0)
+pushd "$(dirname "$0")" > /dev/null
+SCRIPTS_DIR=$(pwd)
+popd > /dev/null
 
-cd $(dirname $1)
-emacs -batch $(basename $1) -l ${SCRIPTS_DIR}/indent-matlab.el
+for f in "$@"; do
+    echo "*** Indenting $f…"
+
+    pushd "$(dirname "$f")" > /dev/null
+    emacs -batch "$(basename "$f")" -l "${SCRIPTS_DIR}"/indent-matlab.el
+    popd > /dev/null
+
+    echo
+done