View | Details | Raw Unified | Return to bug 205753 | Differences between
and this patch

Collapse All | Expand All

(-)automx/files/patch-src-automx-test (-7 / +9 lines)
Lines 1-5 Link Here
1 
--- src/automx-test.orig	2014-01-03 08:38:38.000000000 +0000
 1 
--- src/automx-test.orig	2014-04-26 16:16:55 UTC
2 
+++ src/automx-test	2014-04-14 22:20:41.000000000 +0100
 2 
+++ src/automx-test
3 
@@ -1,4 +1,4 @@
 3 
@@ -1,4 +1,4 @@
4 
-#!/bin/bash
 4 
-#!/bin/bash
5 
+#!/bin/sh
 5 
+#!/bin/sh
Lines 31-37 Link Here
31 
 	PROFILE="$1"
 31 
 	PROFILE="$1"
32 
 else
32 
 else
33 
 	echo "Provide the mail address for which configuration settings should be retrieved."
 33 
 	echo "Provide the mail address for which configuration settings should be retrieved."
34 
@@ -44,7 +46,7 @@
 34 
@@ -44,7 +46,7 @@ MBCRESPONSE="$(mktemp /tmp/${PROGRAM_NAM
35
35
36 
 # Test Mozilla schema
 36 
 # Test Mozilla schema
37 
 AUTOCONF="autoconfig.$DOMAIN"
 37 
 AUTOCONF="autoconfig.$DOMAIN"
Lines 40-46 Link Here
40 
 	CON="http://$AUTOCONF/mail/config-v1.1.xml?emailaddress=$PROFILE"
 40 
 	CON="http://$AUTOCONF/mail/config-v1.1.xml?emailaddress=$PROFILE"
41 
 	echo
 41 
 	echo
42 
 	echo "Testing Autoconfig ..."
 42 
 	echo "Testing Autoconfig ..."
43 
@@ -60,13 +62,13 @@
 43 
@@ -60,13 +62,13 @@ fi
44
44
45 
 # Test Microsoft schema
 45 
 # Test Microsoft schema
46 
 AUTODISC="autodiscover.$DOMAIN"
 46 
 AUTODISC="autodiscover.$DOMAIN"
Lines 48-54 Link Here
48 
+if [ -z "$(dig +short $AUTODISC)" ]; then
 48 
+if [ -z "$(dig +short $AUTODISC)" ]; then
49 
 	# default domain does not exist, try to discover non-default
 49 
 	# default domain does not exist, try to discover non-default
50 
 	AUTODISC="$(dig +short -t srv _autodiscover._tcp.$DOMAIN)"
 50 
 	AUTODISC="$(dig +short -t srv _autodiscover._tcp.$DOMAIN)"
51 
   	AUTODISC="${AUTODISC//* /}"
 51 
-  	AUTODISC="${AUTODISC//* /}"
52 
+  	AUTODISC="`echo ${AUTODISC} | sed \"s/.* //g\"`"
52 
   	AUTODISC="${AUTODISC%.*}"
 53 
   	AUTODISC="${AUTODISC%.*}"
53 
 fi
 54 
 fi
54 
-if [[ $AUTODISC ]]; then
 55 
-if [[ $AUTODISC ]]; then
Lines 56-62 Link Here
56 
 	# Test Microsoft Outlook schema
 57 
 	# Test Microsoft Outlook schema
57 
 	CON="https://$AUTODISC/autodiscover/autodiscover.xml"
 58 
 	CON="https://$AUTODISC/autodiscover/autodiscover.xml"
58 
 	cat <<-REQ >$OLREQUEST
 59 
 	cat <<-REQ >$OLREQUEST
59 
@@ -111,13 +113,13 @@
 60 
@@ -111,13 +113,13 @@ fi
60
61
61 
 # Test mobileconfig schema
 62 
 # Test mobileconfig schema
62 
 AUTODISC="autodiscover.$DOMAIN"
 63 
 AUTODISC="autodiscover.$DOMAIN"
Lines 64-70 Link Here
64 
+if [ -z "$(dig +short $AUTODISC)" ]; then
 65 
+if [ -z "$(dig +short $AUTODISC)" ]; then
65 
 	# default domain does not exist, try to discover non-default
 66 
 	# default domain does not exist, try to discover non-default
66 
 	AUTODISC="$(dig +short -t srv _autodiscover._tcp.$DOMAIN)"
 67 
 	AUTODISC="$(dig +short -t srv _autodiscover._tcp.$DOMAIN)"
67 
   	AUTODISC="${AUTODISC//* /}"
 68 
-  	AUTODISC="${AUTODISC//* /}"
69 
+  	AUTODISC="`echo ${AUTODISC} | sed \"s/.* //g\"`"
68 
   	AUTODISC="${AUTODISC%.*}"
 70 
   	AUTODISC="${AUTODISC%.*}"
69 
 fi
 71 
 fi
70 
-if [[ $AUTODISC ]]; then
 72 
-if [[ $AUTODISC ]]; then

Return to bug 205753