# HG changeset patch
# User Dominique Corbex <domcox@users.sourceforge.net>
# Date 1245352259 -7200
# Node ID 07633a539a9d019870fdaf4ba55c82150201eb2f
# Parent  8d681e35f63dc37b711c24aaceb3b37ef61bc0bf
get-softmodem-driver: Add automatic country detection during martian install

diff -r 8d681e35f63d -r 07633a539a9d get-softmodem-driver/receipt
--- a/get-softmodem-driver/receipt	Thu Jun 18 23:55:12 2009 +0800
+++ b/get-softmodem-driver/receipt	Thu Jun 18 21:10:59 2009 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="get-softmodem-driver"
-VERSION="0.9"
+VERSION="0.11"
 CATEGORY="non-free"
 SHORT_DESC="Get misc softmodem drivers."
 MAINTAINER="domcox@slitaz.org"
diff -r 8d681e35f63d -r 07633a539a9d get-softmodem-driver/stuff/get-softmodem-driver
--- a/get-softmodem-driver/stuff/get-softmodem-driver	Thu Jun 18 23:55:12 2009 +0800
+++ b/get-softmodem-driver/stuff/get-softmodem-driver	Thu Jun 18 21:10:59 2009 +0200
@@ -9,25 +9,21 @@
 {
 echo "--------------------------------------------------------"
 echo "Due to a lack of compatible hardware for troubleshooting,"
-echo "this $PACKAGE package has not been tested."
-echo "Please report any bug to SliTaz Labs or SliTaz Forum."
+echo "this $PACKAGE package has not been tested. Please report"
+echo "any success, failure, bug to SliTaz Labs or SliTaz Forum."
 echo "--------------------------------------------------------"
 sleep 1
 }
 
 case "$PACKAGE" in
 hsfmodem)
-	. /usr/share/softmodem/hsfmodem.receipt
-	echo $SHORT_DESC;;
+	. /usr/share/softmodem/hsfmodem.receipt ;;
 hcfpcimodem)
-	. /usr/share/softmodem/hcfpcimodem.receipt
-	echo $SHORT_DESC;;
+	. /usr/share/softmodem/hcfpcimodem.receipt ;;
 martian)
-	. /usr/share/softmodem/martian.receipt
-	echo $SHORT_DESC;;
+	. /usr/share/softmodem/martian.receipt ;;
 slmodem)
-	. /usr/share/softmodem/slmodem.receipt
-	echo $SHORT_DESC;;
+	. /usr/share/softmodem/slmodem.receipt ;;
 *)
 	echo "Unknown modem driver. Please run one of the following commands:"
 	for i in $(cd $(dirname $0); ls get-*-driver); do
@@ -38,6 +34,9 @@
 	exit 1;;
 esac
 
+# Report
+echo "Installing $SHORT_DESC.."
+
 # Check if user is root to install.
 if test $(id -u) != 0 ; then
 	echo -e "\nYou must be root to run `basename $0`."
@@ -142,6 +141,11 @@
 	cp -a kmodule/martian_dev.ko $fs/lib/modules/`uname -r`/martian
 	mkdir -p $fs/etc/init.d
 	cp -a /usr/share/softmodem/martian.init $fs/etc/init.d/martian
+	chmod +x $fs/etc/init.d/martian
+	# Data for automatic region setting
+	mkdir -p $fs/usr/share/martian
+	cp -a /usr/share/softmodem/zone.tab $fs/usr/share/martian
+	cp -a /usr/share/softmodem/martian.country $fs/usr/share/martian
 	rm -rf $src
 	;;
 slmodem)
diff -r 8d681e35f63d -r 07633a539a9d get-softmodem-driver/stuff/martian.country
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/get-softmodem-driver/stuff/martian.country	Thu Jun 18 21:10:59 2009 +0200
@@ -0,0 +1,88 @@
+AE	ae	UNITED_ARAB_EMIRATES
+AR	ar	ARGENTINA
+AT	at	AUSTRIA
+AU	au	AUSTRALIA
+BB	bb	BARBADOS
+BD	bd	BANGLADESH
+BG	bg	BULGARIA
+BO	bo	BOLIVIA
+BR	br	BRAZIL
+BY	by	BELARUS
+CA	ca	CANADA
+CH	ch	SWITZERLAND
+CL	cl	CHILE
+CN	cn	CHINA
+CO	co	COLOMBIA
+CR	cr	COSTA_RICA
+CY	cy	CYPRUS
+CZ	cz	CZECH_REPUBLIC
+DE	de	GERMANY
+DK	dk	DENMARK
+EC	ec	ECUADOR
+EE	ee	ESTONIA
+EG	eg	EGYPT
+ES	es	SPAIN
+EU	eu	EUROPE
+FI	fi	FINLAND
+FR	fr	FRANCE
+GP	fr	GUADELOUPE
+GR	gr	GREECE
+GT	gt	GUATEMALA
+GU	gu	GUAM
+HK	hk	HONG_KONG
+HR	hr	CROATIA
+HU	hu	HUNGARY
+ID	id	INDONESIA
+IE	ie	IRELAND
+IL	il	ISRAEL
+IN	in	INDIA
+IS	is	ICELAND
+IT	it	ITALY
+JP	jp	JAPAN
+KR	kr	REPUBLIC_OF_KOREA
+KW	kw	KUWAIT
+LB	lb	LEBANON
+LI	li	LIECHTENSTEIN
+LK	lk	SRI_LANKA
+LT	lt	LITHUANIA
+LU	lu	LUXEMBOURG
+LV	lv	LATVIA
+MA	ma	MOROCCO
+MQ	fr	MARTINIQUE
+MT	mt	MALTA
+MX	mx	MEXICO
+MY	my	MALAYSIA
+NC	fr	NEW_CALEDONIA
+NI	ni	NICARAGUA
+NL	nl	NETHERLANDS
+NO	no	NORWAY
+NZ	nz	NEW_ZEALAND
+OM	om	OMAN
+PA	pa	PANAMA
+PE	pe	PERU
+PH	ph	PHILIPPINES
+PJ	fr	FRENCH_POLYNESIA
+PK	pk	PAKISTAN
+PL	pl	POLAND
+PR	pr	PUERTO_RICO
+PT	pt	PORTUGAL
+PY	py	PARAGUAY
+RO	ro	ROMANIA
+RU	ru	RUSSIA
+SA	sa	SAUDI_ARABIA
+SE	se	SWEDEN
+SG	sg	SINGAPORE
+SI	si	SLOVENIA
+SK	sk	SLOVAKIA
+TH	th	THAILAND
+TN	tn	TUNISIA
+TR	tr	TURKEY
+TW	tw	TAIWAN
+UA	ua	UKRAINE
+UK	uk	UNITED_KINGDOM
+US	us	UNITED_STATES
+UY	uy	URUGUAY
+VE	ve	VENEZUELA
+VI	vi	VIRGIN_ISLANDS_U.S.
+VN	vn	VIET_NAM
+ZA	za	SOUTH_AFRICA
diff -r 8d681e35f63d -r 07633a539a9d get-softmodem-driver/stuff/martian.init
--- a/get-softmodem-driver/stuff/martian.init	Thu Jun 18 23:55:12 2009 +0800
+++ b/get-softmodem-driver/stuff/martian.init	Thu Jun 18 21:10:59 2009 +0200
@@ -11,7 +11,7 @@
 NAME="Martian modem"
 DESC="Agere Systems PCI Modem deamon"
 DAEMON=/usr/sbin/martian_modem
-OPTIONS="--daemon $MARTIAN_OPTIONS /dev/ttySM0"
+OPTIONS="--daemon $MARTIAN_OPTIONS"
 PIDFILE=/var/run/martian.pid
 MODULE="martian_dev"
 
@@ -36,7 +36,8 @@
       exit 1
     fi
     echo -n "Stopping $DESC: $NAME... "
-    kill `cat $PIDFILE`
+    killall martian_modem
+	rm $PIDFILE
     status
     ;;
   restart)
@@ -45,7 +46,7 @@
       exit 1
     fi
     echo -n "Restarting $DESC: $NAME... "
-    kill `cat $PIDFILE`
+    killall martian_modem
     sleep 2
     $DAEMON $OPTIONS &&  echo `/bin/pidof $DAEMON` > $PIDFILE
     status
diff -r 8d681e35f63d -r 07633a539a9d get-softmodem-driver/stuff/martian.receipt
--- a/get-softmodem-driver/stuff/martian.receipt	Thu Jun 18 23:55:12 2009 +0800
+++ b/get-softmodem-driver/stuff/martian.receipt	Thu Jun 18 21:10:59 2009 +0200
@@ -17,21 +17,33 @@
 	# Country settings
 	if [ -e /etc/TZ ]; then
 		ZONE=`cat /etc/TZ`
-		CODE=`grep $ZONE /usr/share/softmodem/marszone.tab | cut -f1'`
+		CODE=`grep $ZONE /usr/share/martian/zone.tab | cut -f1'`
 		if [ -n $CODE ]; then
-			COUNTRY=`grep ^$CODE /usr/share/softmodem/martian.country | cut -f2`
+			COUNTRY=`grep ^$CODE /usr/share/martian/martian.country | cut -f2`
+			COUNTRY_NAME=`grep ^$CODE /usr/share/martian/martian.country | cut -f3`
 		fi
 	fi
 	if [ -z $COUNTRY ]; then
-		COUNTRY="USA"
+		COUNTRY="us"
+		COUNTRY_NAME="USA"
 	fi
-	cat >> $root/etc/daemons.conf << "EOT"
-# martian daemon options.
-MARTIAN_OPTIONS="--country=$COUNTRY"
-
-EOT
+	echo "Automatic country setting: $COUNTRY_NAME"
+	# Save options
+	if [ `grep -c MARTIAN_OPTIONS /etc/daemons.conf` -gt 0 ]; then
+		sed -i 's/MARTIAN_OPTIONS=.*/MARTIAN_OPTIONS="--country='"$COUNTRY"' \/dev\/ttySM0"/' /etc/daemons.conf
+	else
+	echo "# slmodemd daemon options." >> $root/etc/daemons.conf
+		echo "MARTIAN_OPTIONS=\"--country=$COUNTRY /dev/ttySM0\"" >> $root/etc/daemons.conf
+		echo  >> $root/etc/daemons.conf
+	fi
 	# Load module
 	/sbin/depmod -a
 	/sbin/modprobe martian_dev && \
 	/etc/init.d/martian start
 }
+
+post_remove()
+{
+	/etc/init.d/martian stop
+	rm -rf /usr/share/martian
+}
diff -r 8d681e35f63d -r 07633a539a9d get-softmodem-driver/stuff/slmodem.country
--- a/get-softmodem-driver/stuff/slmodem.country	Thu Jun 18 23:55:12 2009 +0800
+++ b/get-softmodem-driver/stuff/slmodem.country	Thu Jun 18 21:10:59 2009 +0200
@@ -28,7 +28,6 @@
 GL	CTR21EUROPE
 GP	FRANCE
 GR	GREECE
-GY	FRANCE
 HK	HONG_KONG
 HU	HUNGARY
 ID	INDONESIA
diff -r 8d681e35f63d -r 07633a539a9d get-softmodem-driver/stuff/slmodem.receipt
--- a/get-softmodem-driver/stuff/slmodem.receipt	Thu Jun 18 23:55:12 2009 +0800
+++ b/get-softmodem-driver/stuff/slmodem.receipt	Thu Jun 18 21:10:59 2009 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Support for the SmartLink Softmodem and ALSA supported chipsets."
 MAINTAINER="domcox@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-DEPENDS="module-init-tools linux-source"
+DEPENDS="alsa-lib module-init-tools linux-source"
 WEB_SITE="http://linmodems.technion.ac.il"
 WGET_URL="http://linmodems.technion.ac.il/packages/smartlink/$TARBALL"
 
@@ -41,5 +41,6 @@
 
 post_remove()
 {
+	/etc/init.d/slmodem stop
 	rm -rf /usr/share/slmodem
 }
\ No newline at end of file