Преглед на файлове

base-files: fix default pre-/postrm for packages with a dot

Instead of stripping everything after the first dot, strip everything
after the last dot.
This fixes pre-/postrm actions for packages with a dot in their name,
like libusb-1.0.

Fixes #19668.

Signed-off-by: Jonas Gorski <[email protected]>

SVN-Revision: 45702
Jonas Gorski преди 10 години
родител
ревизия
d0af85c9a5
променени са 1 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 2 2
      package/base-files/files/lib/functions.sh

+ 2 - 2
package/base-files/files/lib/functions.sh

@@ -165,7 +165,7 @@ insert_modules() {
 
 default_prerm() {
 	local name
-	name=$(echo $(basename $1) | cut -d. -f1)
+	name=$(basename ${1%.*})
 	[ -f /usr/lib/opkg/info/${name}.prerm-pkg ] && . /usr/lib/opkg/info/${name}.prerm-pkg
 	for i in `cat /usr/lib/opkg/info/${name}.list | grep "^/etc/init.d/"`; do
 		$i disable
@@ -175,7 +175,7 @@ default_prerm() {
 
 default_postinst() {
 	local pkgname rusers
-	pkgname=$(echo $(basename $1) | cut -d. -f1)
+	pkgname=$(basename ${1%.*})
 	rusers=$(grep "Require-User:" ${IPKG_INSTROOT}/usr/lib/opkg/info/${pkgname}.control)
 	[ -n "$rusers" ] && {
 		local user group uid gid