[openwrt/openwrt] scripts/kernel_bump: Always drop v prefix

LEDE Commits lede-commits at lists.infradead.org
Fri Apr 12 09:21:00 PDT 2024


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/03f2f530a00a55e6580733cd6ccd01a018a473ee

commit 03f2f530a00a55e6580733cd6ccd01a018a473ee
Author: Olliver Schinagl <oliver at schinagl.nl>
AuthorDate: Fri Mar 22 08:38:02 2024 +0100

    scripts/kernel_bump: Always drop v prefix
    
    Naivly and lazyly the leading v was only dropped from optarg, not from any
    environment variable.
    
    Lets do this properly and ensure a leading 'v' is always dropped.
    
    Signed-off-by: Olliver Schinagl <oliver at schinagl.nl>
---
 scripts/kernel_bump.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/kernel_bump.sh b/scripts/kernel_bump.sh
index bbf6747fc1..82ee3f3eff 100755
--- a/scripts/kernel_bump.sh
+++ b/scripts/kernel_bump.sh
@@ -77,6 +77,9 @@ init()
 	initial_branch="$(git rev-parse --abbrev-ref HEAD)"
 	initial_commitish="$(git rev-parse HEAD)"
 
+	source_version="${source_version#v}"
+	target_version="${target_version#v}"
+
 	trap cleanup EXIT HUP INT QUIT ABRT ALRM TERM
 }
 
@@ -180,10 +183,10 @@ main()
 			platform_name="${OPTARG}"
 			;;
 		's')
-			source_version="${OPTARG#v}"
+			source_version="${OPTARG}"
 			;;
 		't')
-			target_version="${OPTARG#v}"
+			target_version="${OPTARG}"
 			;;
 		':')
 			e_err "Option -${OPTARG} requires an argument."




More information about the lede-commits mailing list