Improve output of script, replace which with more reliable hash #867

mavros/scripts/install_geographiclib_datasets.sh

@@ -2,8 +2,6 @@
 # Script to install the model datasets required
 # to GeographicLib apply certain conversions
 
-set -x
-
 if [[ $UID != 0 ]]; then
 	echo "This script require root privilegies!" 1>&2
 	exit 1
@@ -17,18 +15,20 @@ run_get() {
 
 	files=$(shopt -s nullglob dotglob; echo /usr/share/GeographicLib/$dir/$model* /usr/local/share/GeographicLib/$dir/$model*)
 	if (( ${#files} )); then
+		echo "GeographicLib $tool dataset $model already exists, skipping"
 		return
 	fi
 
-	geographiclib-get-$tool $model
+	echo "Installing GeographicLib $tool $model"
+	geographiclib-get-$tool $model >/dev/null 2>&1
 }
 
 # check which command script is available
-if which /usr/sbin/geographiclib-get-geoids; then
+if hash geographiclib-get-geoids; then
 	run_get geoids geoids egm96-5
 	run_get gravity gravity egm96
 	run_get magnetic magnetic emm2015
-elif which geographiclib-datasets-download; then # only allows install the goid model dataset
+elif hash geographiclib-datasets-download; then # only allows install the goid model dataset
 	geographiclib-datasets-download egm96_5;
 else
 	echo "OS not supported! Check GeographicLib page for supported OS and lib versions." 1>&2