androud-udev-git: sysusers.d compliance

3 files changed, 17 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9741816ea705..a8f9b50748ba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Nov 20 17:36:20 UTC 2017
+# Sat Dec 16 17:55:46 UTC 2017
 pkgbase = android-udev-git
 	pkgdesc = Udev rules to connect Android devices to your linux box
-	pkgver = 20171113.r0.gd91c7c7
+	pkgver = 20171206.r4.g661d121
 	pkgrel = 1
 	url = https://github.com/M0Rf30/android-udev-rules
 	install = android-udev.install
diff --git a/PKGBUILD b/PKGBUILD
index 95e047613dc6..a904b017a73f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: marlock
 
 pkgname=android-udev-git
-pkgver=20171113.r0.gd91c7c7
+pkgver=20171206.r4.g661d121
 pkgrel=1
 pkgdesc='Udev rules to connect Android devices to your linux box'
 arch=('any')
@@ -17,10 +17,17 @@ install='android-udev.install'
 
 package() {
   cd android-udev
+  # Creating system folders
   mkdir -p $pkgdir/usr/lib/udev/rules.d/
+  mkdir -p $pkgdir/usr/lib/sysusers.d
   mkdir -p $pkgdir/usr/share/android/
+
+  # Installing rules and confs
   cp adb_usb.ini $pkgdir/usr/share/android/
   cp 51-android.rules $pkgdir/usr/lib/udev/rules.d/51-android.rules
+  cp android-udev.conf $pkgdir/usr/lib/sysusers.d
+
+  # Setting permissions
   chmod a+r $pkgdir/usr/lib/udev/rules.d/51-android.rules
 }
 
diff --git a/android-udev.install b/android-udev.install
index 4fd78e291655..19cf8761a4cd 100644
--- a/android-udev.install
+++ b/android-udev.install
@@ -1,11 +1,12 @@
 post_install() {
-getent group adbusers >> /dev/null || /usr/sbin/groupadd adbusers || return 1
-/bin/cat << EOF
+cat << EOF
 ===> If you have problems with printers or other devices please comment the relevant line
 ===> in "/usr/lib/udev/rules.d/51-android.rules"
 
 ===> Some devices (particularly MediaTek and Xiaomi) also require an entry in $HOME/.android/adb_usb.ini. 
 ===> You can use the adb_usb.ini under /usr/share/android/adb_usb.ini
+===> Remember to add your user to adbusers group.
+===> 	gpasswd -a youruser adbusers
 EOF
 }
 
@@ -14,5 +15,8 @@ post_install
 }
 
 post_remove() {
-getent group adbusers &>/dev/null && /usr/sbin/groupdel adbusers
+cat <<EOF
+==> Remember to delete your user from adbusers group.
+===> 	gpasswd -d youruser adbusers
+EOF
 }