[pkg-kolab] r1378 - kolab-cyrus-imapd/scripts

[Mathieu Parent]

Author: sathieu
Date: 2009-10-18 12:16:24 +0000 (Sun, 18 Oct 2009)
New Revision: 1378

Modified:
   kolab-cyrus-imapd/scripts/cyrus-to-kolab
Log:
cyrus-to-kolab: better args check


Modified: kolab-cyrus-imapd/scripts/cyrus-to-kolab
===================================================================
--- kolab-cyrus-imapd/scripts/cyrus-to-kolab	2009-10-18 12:06:03 UTC (rev 1377)
+++ kolab-cyrus-imapd/scripts/cyrus-to-kolab	2009-10-18 12:16:24 UTC (rev 1378)
@@ -15,6 +15,8 @@
 
 set -e
 
+me=$(basename $0)
+
 #==============================================================================
 # Config
 kolab_maintainer="Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>"
@@ -30,21 +32,6 @@
 
 kolab_patches_disabled='45-kolab2-annotations.dpatch'
 #==============================================================================
-# Args and constructed variables
-me=$(basename $0)
-
-cyrus_dir=$1
-cyrus_dir_debian=$cyrus_dir/debian
-trunk_dir=$2
-trunk_dir_debian=$trunk_dir/debian
-dest_dir=$3
-dest_dir_debian=$dest_dir/debian
-
-if [ -e $dest_dir ]; then
-	error "directory $dest_dir already exists"
-fi
-
-#==============================================================================
 # Functions
 error() {
 	echo "$me: $1" 1>&2
@@ -126,6 +113,29 @@
 }
 
 #==============================================================================
+# Args and constructed variables
+cyrus_dir=$1
+cyrus_dir_debian=$cyrus_dir/debian
+trunk_dir=$2
+trunk_dir_debian=$trunk_dir/debian
+dest_dir=$3
+dest_dir_debian=$dest_dir/debian
+
+if [ -z $cyrus_dir ] || [ -z $trunk_dir ] || [ -z $dest_dir ]; then
+    error "Usage: cyrus-to-kolab cyrus-dir kolab-trunk dest-dir"
+fi
+if [ ! -d $cyrus_dir_debian ]; then
+	error "directory '$cyrus_dir_debian' does not exists"
+fi
+if [ ! -d $trunk_dir_debian ]; then
+	error "directory '$trunk_dir_debian' does not exists"
+fi
+if [ -e $dest_dir ]; then
+	error "directory '$dest_dir' already exists"
+fi
+
+
+#==============================================================================
 # Copy
 mkdir $dest_dir
 cp -a $cyrus_dir_debian $dest_dir_debian