From 9ab184030583ebf0e86f06cd881df40c71dd73c1 Mon Sep 17 00:00:00 2001
From: "Slawomir Wojciech Wojtczak (vermaden)" <vermaden@interia.pl>
Date: Mon, 27 Feb 2012 20:27:21 +0100
Subject: [PATCH] 1.2

---
 automount                                   |  29 ++++++++++++++++----
 automount.conf                              |   2 ++
 port/distfiles/automount-1.0.tar.gz         | Bin 3256 -> 3447 bytes
 port/distfiles/automount-1.0/automount      |  29 ++++++++++++++++----
 port/distfiles/automount-1.0/automount.conf |   7 +++++
 port/sysutils/automount/distinfo            |   4 +--
 6 files changed, 57 insertions(+), 14 deletions(-)
 create mode 100644 port/distfiles/automount-1.0/automount.conf

diff --git a/automount b/automount
index 1d69ac5..b4c3ce9 100755
--- a/automount
+++ b/automount
@@ -83,6 +83,20 @@ USERUMOUNT (set to NO by default)
   system with their selected file manager.
 
   example: USERUMOUNT="YES"
+
+ATIME (set to YES by default)
+  When set to NO it will mount filesystems with
+  noatime options when possible.
+
+  example: ATIME="NO"
+
+REMOVEDIRS (set to NO by default)
+  When set to YES it will remove empty directories
+  under the used ${MNTPREFIX} after device detach.
+
+  example: REMOVEDIRS="YES"
+
+
 EOF
   exit 0
 }
@@ -98,6 +112,8 @@ EOF
 : ${CODEPAGE="cp437"}                 # US/Canada
 : ${DATEFMT="%Y-%m-%d %H:%M:%S"}      # 2012-02-20 07:49:09
 : ${USERUMOUNT="NO"}                  # when YES add suid bit to umount(8)
+: ${ATIME="YES"}                      # when NO mount with noatime
+: ${REMOVEDIRS="NO"}                  # remove empty dirs under ${MNTPREFIX}
 : ${USER="0"}                         # which user to use for popup
 : ${FM="0"}                           # which file manager to use
 
@@ -140,6 +156,7 @@ case ${2} in
     MNT="${MNTPREFIX}/${1}"
     __check_already_mounted ${MNT}
     __create_mount_point ${DEV}
+    [ "${ATIME}" = NO ] && OPTS="noatime"
     case $( file -b -L -s ${DEV} | sed -E 's/label:\ \".*\"//g' ) in
       (*FAT*) # must be before NTFS section: newfs_msdos -O NTFS -L NTFS
         dd < ${DEV} count=1 2> /dev/null | strings | grep "FAT32" && {
@@ -152,7 +169,7 @@ case ${2} in
       (*NTFS*) # must be after FAT section: newfs_msdos -O NTFS -L NTFS
         dd < ${DEV} count=1 2> /dev/null | strings | head -1 | grep "NTFS" && {
           which ntfs-3g 1> /dev/null 2> /dev/null && {
-            ntfs-3g -o noatime ${DEV} ${MNT} && ADD=1 # sysutils/fusefs-ntfs
+            ntfs-3g -o ${OPTS} ${DEV} ${MNT} && ADD=1 # sysutils/fusefs-ntfs
           } || {
             [ "${USER}" = 0 ] || OPTS="-u ${USER} -g $( id -g -n ${USER} )"
             mount_ntfs ${OPTS} -o noatime ${DEV} ${MNT} && ADD=1
@@ -162,12 +179,12 @@ case ${2} in
         ;;
       (*ext2*)
         fsck.ext2 -y ${DEV}
-        mount -t ext2fs -o noatime ${DEV} ${MNT} && ADD=1
+        mount -t ext2fs -o ${OPTS} ${DEV} ${MNT} && ADD=1
         __log "${DEV}:mount (ext2)"
         ;;
       (*ext3*)
         fsck.ext3 -y ${DEV}
-        mount -t ext2fs -o noatime ${DEV} ${MNT} && ADD=1
+        mount -t ext2fs -o ${OPTS} ${DEV} ${MNT} && ADD=1
         __log "${DEV}:mount (ext3)"
         ;;
       (*ext4*)
@@ -177,13 +194,13 @@ case ${2} in
         ;;
       (*Unix\ Fast\ File*)
         fsck_ufs -C -y ${DEV}
-        mount -o noatime ${DEV} ${MNT} && ADD=1
+        mount -o ${OPTS} ${DEV} ${MNT} && ADD=1
         __log "${DEV}:mount (ufs)"
         ;;
       (*)
         case $( dd < ${DEV} count=1 2> /dev/null | strings | head -1 ) in
           (EXFAT)
-            mount.exfat -o noatime ${DEV} ${MNT} && ADD=1 # sysutils/fusefs-exfat
+            mount.exfat -o ${OPTS} ${DEV} ${MNT} && ADD=1 # sysutils/fusefs-exfat
             __log "${DEV}:mount (exfat)"
             ;;
         esac
@@ -210,7 +227,7 @@ case ${2} in
           __log "${DEV}:umount"
         done
     __log "${DEV}:detach"
-    find ${MNTPREFIX} -type d -empty -maxdepth 1 -delete
+    [ "${REMOVEDIRS}" = YES ] && find ${MNTPREFIX} -type d -empty -maxdepth 1 -delete
     ;;
 
 esac
diff --git a/automount.conf b/automount.conf
index a2d89cd..1ba5f6c 100644
--- a/automount.conf
+++ b/automount.conf
@@ -1,4 +1,6 @@
 USERUMOUNT=YES
+ATIME=NO
+REMOVEDIRS=YES
 FM="nautilus --browser --no-desktop"
 USER=vermaden
 ENCODING=pl_PL.ISO8859-2
diff --git a/port/distfiles/automount-1.0.tar.gz b/port/distfiles/automount-1.0.tar.gz
index 6fd0955e5f8eab211227f758c3f1931ca88840e9..b0659a2c6fe23234dd5a792ece56d33fb9418b3e 100644
GIT binary patch
literal 3447
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
Zlu}A5rIb=iDW&|K<-gL?yLJFj006hI>4*RT

literal 3256
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

diff --git a/port/distfiles/automount-1.0/automount b/port/distfiles/automount-1.0/automount
index 1d69ac5..b4c3ce9 100755
--- a/port/distfiles/automount-1.0/automount
+++ b/port/distfiles/automount-1.0/automount
@@ -83,6 +83,20 @@ USERUMOUNT (set to NO by default)
   system with their selected file manager.
 
   example: USERUMOUNT="YES"
+
+ATIME (set to YES by default)
+  When set to NO it will mount filesystems with
+  noatime options when possible.
+
+  example: ATIME="NO"
+
+REMOVEDIRS (set to NO by default)
+  When set to YES it will remove empty directories
+  under the used ${MNTPREFIX} after device detach.
+
+  example: REMOVEDIRS="YES"
+
+
 EOF
   exit 0
 }
@@ -98,6 +112,8 @@ EOF
 : ${CODEPAGE="cp437"}                 # US/Canada
 : ${DATEFMT="%Y-%m-%d %H:%M:%S"}      # 2012-02-20 07:49:09
 : ${USERUMOUNT="NO"}                  # when YES add suid bit to umount(8)
+: ${ATIME="YES"}                      # when NO mount with noatime
+: ${REMOVEDIRS="NO"}                  # remove empty dirs under ${MNTPREFIX}
 : ${USER="0"}                         # which user to use for popup
 : ${FM="0"}                           # which file manager to use
 
@@ -140,6 +156,7 @@ case ${2} in
     MNT="${MNTPREFIX}/${1}"
     __check_already_mounted ${MNT}
     __create_mount_point ${DEV}
+    [ "${ATIME}" = NO ] && OPTS="noatime"
     case $( file -b -L -s ${DEV} | sed -E 's/label:\ \".*\"//g' ) in
       (*FAT*) # must be before NTFS section: newfs_msdos -O NTFS -L NTFS
         dd < ${DEV} count=1 2> /dev/null | strings | grep "FAT32" && {
@@ -152,7 +169,7 @@ case ${2} in
       (*NTFS*) # must be after FAT section: newfs_msdos -O NTFS -L NTFS
         dd < ${DEV} count=1 2> /dev/null | strings | head -1 | grep "NTFS" && {
           which ntfs-3g 1> /dev/null 2> /dev/null && {
-            ntfs-3g -o noatime ${DEV} ${MNT} && ADD=1 # sysutils/fusefs-ntfs
+            ntfs-3g -o ${OPTS} ${DEV} ${MNT} && ADD=1 # sysutils/fusefs-ntfs
           } || {
             [ "${USER}" = 0 ] || OPTS="-u ${USER} -g $( id -g -n ${USER} )"
             mount_ntfs ${OPTS} -o noatime ${DEV} ${MNT} && ADD=1
@@ -162,12 +179,12 @@ case ${2} in
         ;;
       (*ext2*)
         fsck.ext2 -y ${DEV}
-        mount -t ext2fs -o noatime ${DEV} ${MNT} && ADD=1
+        mount -t ext2fs -o ${OPTS} ${DEV} ${MNT} && ADD=1
         __log "${DEV}:mount (ext2)"
         ;;
       (*ext3*)
         fsck.ext3 -y ${DEV}
-        mount -t ext2fs -o noatime ${DEV} ${MNT} && ADD=1
+        mount -t ext2fs -o ${OPTS} ${DEV} ${MNT} && ADD=1
         __log "${DEV}:mount (ext3)"
         ;;
       (*ext4*)
@@ -177,13 +194,13 @@ case ${2} in
         ;;
       (*Unix\ Fast\ File*)
         fsck_ufs -C -y ${DEV}
-        mount -o noatime ${DEV} ${MNT} && ADD=1
+        mount -o ${OPTS} ${DEV} ${MNT} && ADD=1
         __log "${DEV}:mount (ufs)"
         ;;
       (*)
         case $( dd < ${DEV} count=1 2> /dev/null | strings | head -1 ) in
           (EXFAT)
-            mount.exfat -o noatime ${DEV} ${MNT} && ADD=1 # sysutils/fusefs-exfat
+            mount.exfat -o ${OPTS} ${DEV} ${MNT} && ADD=1 # sysutils/fusefs-exfat
             __log "${DEV}:mount (exfat)"
             ;;
         esac
@@ -210,7 +227,7 @@ case ${2} in
           __log "${DEV}:umount"
         done
     __log "${DEV}:detach"
-    find ${MNTPREFIX} -type d -empty -maxdepth 1 -delete
+    [ "${REMOVEDIRS}" = YES ] && find ${MNTPREFIX} -type d -empty -maxdepth 1 -delete
     ;;
 
 esac
diff --git a/port/distfiles/automount-1.0/automount.conf b/port/distfiles/automount-1.0/automount.conf
new file mode 100644
index 0000000..1ba5f6c
--- /dev/null
+++ b/port/distfiles/automount-1.0/automount.conf
@@ -0,0 +1,7 @@
+USERUMOUNT=YES
+ATIME=NO
+REMOVEDIRS=YES
+FM="nautilus --browser --no-desktop"
+USER=vermaden
+ENCODING=pl_PL.ISO8859-2
+CODEPAGE=cp852
diff --git a/port/sysutils/automount/distinfo b/port/sysutils/automount/distinfo
index 06ab9cb..e953709 100644
--- a/port/sysutils/automount/distinfo
+++ b/port/sysutils/automount/distinfo
@@ -1,2 +1,2 @@
-SHA256 (automount-1.0.tar.gz) = 8d01d7c5fd6296f5c05a43ffb23726ef85828185864e6f1a970b50dc3b5f073f
-SIZE (automount-1.0.tar.gz) = 3256
+SHA256 (automount-1.0.tar.gz) = 0cf4d5f306d9ca104a3a977fe630a499048e7d226bf980f86afd9e0c111b1b5f
+SIZE (automount-1.0.tar.gz) = 3447