# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1447073034 -7200
# Node ID 911df1d926661d7449127508e3d15b104d569c83
# Parent  e4eed57a72a5411d21606a0c92df275612526c26
libgphoto2, udev: fix post_install()

diff -r e4eed57a72a5 -r 911df1d92666 libgphoto2/receipt
--- a/libgphoto2/receipt	Mon Nov 09 14:00:27 2015 +0200
+++ b/libgphoto2/receipt	Mon Nov 09 14:43:54 2015 +0200
@@ -12,73 +12,78 @@
 TAGS="camera photo"
 
 DEPENDS="libexif jpeg libusb libusb-compat libltdl hal"
-BUILD_DEPENDS="jpeg-dev libexif-dev libtool libexif jpeg libusb libusb-dev libusb-compat libusb-compat-dev pkg-config"
+BUILD_DEPENDS="jpeg-dev libexif-dev libtool libexif jpeg libusb libusb-dev \
+libusb-compat libusb-compat-dev pkg-config"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-   	cd $src
-	./configure --prefix=/usr udevscriptdir=/lib/udev \
-			--with-exif --disable-static $CONFIGURE_ARGS &&
+	./configure \
+		--prefix=/usr \
+		udevscriptdir=/lib/udev \
+		--with-exif \
+		--disable-static \
+		$CONFIGURE_ARGS &&
 	make &&
 	make install
-	
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-    mkdir -p $fs/usr/lib/$PACKAGE $fs/usr/share \
-	          $fs/lib \
-			  $fs/usr/share/hal/fdi/information/20thirdparty \
-			  $fs/etc/udev/rules.d
+	mkdir -p \
+		$fs/usr/lib/$PACKAGE \
+		$fs/usr/share \
+		$fs/lib \
+		$fs/usr/share/hal/fdi/information/20thirdparty \
+		$fs/etc/udev/rules.d
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib/$PACKAGE $fs/usr/lib
 	cp -a $install/usr/lib/${PACKAGE}_port $fs/usr/lib
 	cp -a $install/usr/lib/*so* $fs/usr/lib
 	cp -a $install/usr/share/$PACKAGE $fs/usr/share
 	cp -a $install/lib/udev $fs/lib
-		
+
 	# rm all archive files
 	find $fs/usr/lib -name "*.*a" -exec rm -f {} \; 2> /dev/null
-	
+
 	# fix permissions
 	chmod +x $fs/lib/udev/check*
 	chmod +x $fs/usr/bin/gphoto2*
-	
 }
 
 post_install()
 {
-	local root
-	root=$1
-	
-	HAL_FDI="$1/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi"
-	UDEV_RULE="$1/etc/udev/rules.d/70-libgphoto2.rules"
-	CAM_LIST="$1/usr/lib/libgphoto2/print-camera-list"
+	local root=$1
+
+	HAL_FDI="$root/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi"
+	UDEV_RULE="$root/etc/udev/rules.d/70-libgphoto2.rules"
+	CAM_LIST="$root/usr/lib/libgphoto2/print-camera-list"
 
 	# Let print-camera-list find libgphoto2.so
-	export LD_LIBRARY_PATH="$1/usr/lib"
+	export LD_LIBRARY_PATH="$root/usr/lib"
 	# Let libgphoto2 find its camera-modules before running print-camera-list
-	export CAMLIBS="$1/usr/lib/libgphoto2/$VERSION"
+	export CAMLIBS="$root/usr/lib/libgphoto2/$VERSION"
 
 	# HAL file
 	"$CAM_LIST" hal-fdi > "$HAL_FDI" || return 1
-  
+
 	#udev rule
 	"$CAM_LIST" udev-rules version 0.98 group camera mode 0660 > "$UDEV_RULE" || return 1
-	
-	tazpkg reconfigure udev --root=$1
-	
+
+	tazpkg reconfigure udev --root=$root
+
 	# add group camera
-	if ! grep -q camera $root/etc/group ; then
-		addgroup -g 97 camera
+	if ! grep -q camera $root/etc/group; then
+		chroot "$1/" addgroup -g 97 camera
 	fi
-	
-	echo "Don't forget to add yourself to group camera to use libgphoto2: addgroup tux camera"
+
+	echo
+	echo "Don't forget to add yourself to group camera to use libgphoto2:"
+	echo "    # addgroup tux camera"
 }
 
 post_remove()
 {
-	chroot "$1/" delgroup camera & >/dev/null
+	chroot "$1/" delgroup camera
 }
diff -r e4eed57a72a5 -r 911df1d92666 udev/receipt
--- a/udev/receipt	Mon Nov 09 14:00:27 2015 +0200
+++ b/udev/receipt	Mon Nov 09 14:43:54 2015 +0200
@@ -85,19 +85,20 @@
 
 list_udev_group()
 {
-    object=$2
-    [ -n "$object" ] || object=GROUP
-    grep $object $1/etc/udev/rules.d/* | \
-        sed 's/.*GROUP="\([a-zA-Z0-9]*\)".*/\1/' | sort | uniq
+	object=${2:-GROUP}
+	grep $object $1/etc/udev/rules.d/* | \
+	sed "s|.*$object=\"\([a-zA-Z0-9]*\)\".*|\1|" | sort | uniq
 }
 
 post_install()
 {
-    # Sanity check for udev+ldap boot
-    list_udev_group "$1" GROUP | while read x ; do
-        grep -q ^$x: $1/etc/group || chroot $1/ addgroup -S $x
-    done
-    list_udev_group "$1" OWNER | while read x ; do
-        grep -q ^$x: $1/etc/passwd || chroot $1/ adduser -S -D -H $x
-    done
+	# Sanity check for udev+ldap boot
+	list_udev_group "$1" GROUP | \
+	while read x; do
+		grep -q ^$x: $1/etc/group || chroot $1/ addgroup -S $x
+	done
+	list_udev_group "$1" OWNER | \
+	while read x; do
+		grep -q ^$x: $1/etc/passwd || chroot $1/ adduser -S -D -H $x
+	done
 }