use bash native substitution which matches original

ublue-os · Oct 22, 2024 · d9fabeb · d9fabeb
1 parent 8dc0ece
commit d9fabeb
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/Containerfile.common b/Containerfile.common
@@ -68,11 +68,11 @@ 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=$(echo ${basename} | sed -r "s/(-${kernel_version})//g"); \
+        name=${basename/-${kernel_version}*/}; \
         if [[ "$basename" == *"$kernel_version"* ]]; then \
             fpm --verbose -s rpm -t rpm -p ${rpm} -f --name ${name} ${rpm}; \
         else \
-            echo "Skipping $basename as it does not contain $kernel_version in its name"; \
+            echo "Skipping $basename rebuild as its name does not contain $kernel_version"; \
         fi; \
     done
 

diff --git a/Containerfile.extra b/Containerfile.extra
@@ -68,11 +68,11 @@ 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=$(echo ${basename} | sed -r "s/(-${kernel_version})//g"); \
+        name=${basename/-${kernel_version}*/}; \
         if [[ "$basename" == *"$kernel_version"* ]]; then \
             fpm --verbose -s rpm -t rpm -p ${rpm} -f --name ${name} ${rpm}; \
         else \
-            echo "Skipping $basename as it does not contain $kernel_version in its name"; \
+            echo "Skipping $basename rebuild as its name does not contain $kernel_version"; \
         fi; \
     done
 

diff --git a/Containerfile.nvidia b/Containerfile.nvidia
@@ -65,11 +65,11 @@ 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=$(echo ${basename} | sed -r "s/(-${kernel_version})//g"); \
+        name=${basename/-${kernel_version}*/}; \
         if [[ "$basename" == *"$kernel_version"* ]]; then \
             fpm --verbose -s rpm -t rpm -p ${rpm} -f --name ${name} ${rpm}; \
         else \
-            echo "Skipping $basename as it does not contain $kernel_version in its name"; \
+            echo "Skipping $basename rebuild as its name does not contain $kernel_version"; \
         fi; \
     done
 

diff --git a/Containerfile.nvidia-open b/Containerfile.nvidia-open
@@ -65,11 +65,11 @@ 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=$(echo ${basename} | sed -r "s/(-${kernel_version})//g"); \
+        name=${basename/-${kernel_version}*/}; \
         if [[ "$basename" == *"$kernel_version"* ]]; then \
             fpm --verbose -s rpm -t rpm -p ${rpm} -f --name ${name} ${rpm}; \
         else \
-            echo "Skipping $basename as it does not contain $kernel_version in its name"; \
+            echo "Skipping $basename rebuild as its name does not contain $kernel_version"; \
         fi; \
     done
 

diff --git a/Containerfile.zfs b/Containerfile.zfs
@@ -42,11 +42,11 @@ 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=$(echo ${basename} | sed -r "s/(-${kernel_version})//g"); \
+        name=${basename/-${kernel_version}*/}; \
         if [[ "$basename" == *"$kernel_version"* ]]; then \
             fpm --verbose -s rpm -t rpm -p ${rpm} -f --name ${name} ${rpm}; \
         else \
-            echo "Skipping $basename as it does not contain $kernel_version in its name"; \
+            echo "Skipping $basename rebuild as its name does not contain $kernel_version"; \
         fi; \
     done