make the bash subst more like original

ublue-os · Oct 22, 2024 · 9e06d7b · 9e06d7b
1 parent d9fabeb
commit 9e06d7b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/Containerfile.common b/Containerfile.common
@@ -68,7 +68,7 @@ RUN set -e; \
     kernel_version=$(rpm -q --qf "%{VERSION}-%{RELEASE}.%{ARCH}\n" kernel-core | head -n 1); \
     for rpm in $(find /var/cache/rpms/kmods -type f -name \*.rpm); do \
         basename=$(basename ${rpm}); \
-        name=${basename/-${kernel_version}*/}; \
+        name=${basename%%-${kernel_version}*}; \
         if [[ "$basename" == *"$kernel_version"* ]]; then \
             fpm --verbose -s rpm -t rpm -p ${rpm} -f --name ${name} ${rpm}; \
         else \

diff --git a/Containerfile.extra b/Containerfile.extra
@@ -68,7 +68,7 @@ RUN set -e; \
     kernel_version=$(rpm -q --qf "%{VERSION}-%{RELEASE}.%{ARCH}\n" kernel-core | head -n 1); \
     for rpm in $(find /var/cache/rpms/kmods -type f -name \*.rpm); do \
         basename=$(basename ${rpm}); \
-        name=${basename/-${kernel_version}*/}; \
+        name=${basename%%-${kernel_version}*}; \
         if [[ "$basename" == *"$kernel_version"* ]]; then \
             fpm --verbose -s rpm -t rpm -p ${rpm} -f --name ${name} ${rpm}; \
         else \

diff --git a/Containerfile.nvidia b/Containerfile.nvidia
@@ -65,7 +65,7 @@ RUN set -e; \
     kernel_version=$(rpm -q --qf "%{VERSION}-%{RELEASE}.%{ARCH}\n" kernel-core | head -n 1); \
     for rpm in $(find /var/cache/rpms/kmods -type f -name \*.rpm); do \
         basename=$(basename ${rpm}); \
-        name=${basename/-${kernel_version}*/}; \
+        name=${basename%%-${kernel_version}*}; \
         if [[ "$basename" == *"$kernel_version"* ]]; then \
             fpm --verbose -s rpm -t rpm -p ${rpm} -f --name ${name} ${rpm}; \
         else \

diff --git a/Containerfile.nvidia-open b/Containerfile.nvidia-open
@@ -65,7 +65,7 @@ RUN set -e; \
     kernel_version=$(rpm -q --qf "%{VERSION}-%{RELEASE}.%{ARCH}\n" kernel-core | head -n 1); \
     for rpm in $(find /var/cache/rpms/kmods -type f -name \*.rpm); do \
         basename=$(basename ${rpm}); \
-        name=${basename/-${kernel_version}*/}; \
+        name=${basename%%-${kernel_version}*}; \
         if [[ "$basename" == *"$kernel_version"* ]]; then \
             fpm --verbose -s rpm -t rpm -p ${rpm} -f --name ${name} ${rpm}; \
         else \

diff --git a/Containerfile.zfs b/Containerfile.zfs
@@ -42,7 +42,7 @@ RUN set -e; \
     kernel_version=$(rpm -q --qf "%{VERSION}-%{RELEASE}.%{ARCH}\n" kernel-core | head -n 1); \
     for rpm in $(find /var/cache/rpms/kmods -type f -name \*.rpm); do \
         basename=$(basename ${rpm}); \
-        name=${basename/-${kernel_version}*/}; \
+        name=${basename%%-${kernel_version}*}; \
         if [[ "$basename" == *"$kernel_version"* ]]; then \
             fpm --verbose -s rpm -t rpm -p ${rpm} -f --name ${name} ${rpm}; \
         else \