Merge pull request #14266 from barksten/master

rouault · web-flow · commit b34d00f27286 · 2026-03-31T15:55:09.000+02:00
fix invalid bash function name
diff --git a/scripts/completionFinder.py b/scripts/completionFinder.py
@@ -130,6 +130,8 @@ def getCompletionScript(name, optList):
 
     if name.endswith(".py"):
         func_name = name[0:-3]
+    elif "-" in name:
+        func_name = name.replace("-", "_")
     else:
         func_name = name
 
diff --git a/scripts/gdal-bash-completion.sh b/scripts/gdal-bash-completion.sh
@@ -281,7 +281,7 @@ _gdalcompare()
 }
 complete -o default -F _gdalcompare gdalcompare.py
 complete -o default -F _gdalcompare gdalcompare
-_gdal-config()
+_gdal_config()
 {
   COMPREPLY=()
   cur="${COMP_WORDS[$COMP_CWORD]}"
@@ -298,7 +298,7 @@ _gdal-config()
   esac
   return 0
 }
-complete -o default -F _gdal-config gdal-config
+complete -o default -F _gdal_config gdal-config
 _gdal_contour()
 {
   COMPREPLY=()

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ _gdalcompare()`
`281`	`281`	`}`
`282`	`282`	`complete -o default -F _gdalcompare gdalcompare.py`
`283`	`283`	`complete -o default -F _gdalcompare gdalcompare`
`284`		`-_gdal-config()`
	`284`	`+_gdal_config()`
`285`	`285`	`{`
`286`	`286`	`COMPREPLY=()`
`287`	`287`	`cur="${COMP_WORDS[$COMP_CWORD]}"`
`@@ -298,7 +298,7 @@ _gdal-config()`
`298`	`298`	`esac`
`299`	`299`	`return 0`
`300`	`300`	`}`
`301`		`-complete -o default -F _gdal-config gdal-config`
	`301`	`+complete -o default -F _gdal_config gdal-config`
`302`	`302`	`_gdal_contour()`
`303`	`303`	`{`
`304`	`304`	`COMPREPLY=()`