commit 467ce510afe29f659c3bdcd46f1a351810756fcd
parent 59cdf8ca26ef171f75e61bddc950428325b447af
Author: Jaromil <jaromil@dyne.org>
Date: Wed, 12 Dec 2012 13:47:20 +0100
small fixes for osx
changed install behaviour: will import osx addressbook on install
Diffstat:
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/install.sh b/install.sh
@@ -104,7 +104,7 @@ if ! [ -r $WORKDIR/Applications.txt ]; then
# Example:
# application/rtf oowriter
-
+
EOF
act "Default helper applications settings created"
else
@@ -309,8 +309,13 @@ act " $WORKDIR/bin"
# OS specific post install rules
case $OS in
- GNU) ;;
- MAC) open $WORKDIR ;;
- *)
+ GNU) ;;
+ MAC)
+ # import addressbook
+ notice "Importing addressbook"
+ import_macosx
+ notice "Installation done, opening filemanager on config file dir."
+ open $WORKDIR ;;
+ *)
;;
esac
diff --git a/src/zlibs/addressbook b/src/zlibs/addressbook
@@ -51,7 +51,7 @@ EOF
}
insert_address() {
- _email="$1"; _name="$2";
+ _email="${(Q)1}"; _name="${(Q)2}";
func "insert address: $_name <$_email>"
cat <<EOF | ${SQL} -batch ${addressbook} 2> /dev/null
INSERT INTO $list (email, name)
@@ -222,7 +222,7 @@ import_addressbook() {
fi
}
-
+
# import addressbook from Mac/OSX
import_macosx() {
act "system addressbook from Mac/OSX"
@@ -294,7 +294,7 @@ BEGIN { newcard=0; c=0; name=""; email=""; }
c+=1
print name
print email
- print "# " c
+ print "# " c
}
email=""
next
@@ -454,10 +454,10 @@ EOF
--outformat spruce | awk '
BEGIN { c=0; name=""; email=""; }
/^#/ { if(email != "") {
- c+=1
- print name
- print email
- print "# " c
+ c+=1
+ print name
+ print email
+ print "# " c
}
email=""
next