summaryrefslogtreecommitdiffstats
path: root/mcabber
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2006-01-13 10:44:30 +0000
committer Eric Hameleers <alien@slackware.com>2006-01-13 10:44:30 +0000
commit261ac22488f268128af8957973dd9da50b81ed77 (patch)
treee7a993c3893994a4a057b9c054b48bfa2ca8ee00 /mcabber
parent96fd8bd91af77834cda7c6bda4628f9ad5b79745 (diff)
downloadasb-261ac22488f268128af8957973dd9da50b81ed77.tar.gz
asb-261ac22488f268128af8957973dd9da50b81ed77.tar.xz
Updated to new version. Also made the wrapper script more intelligent about
the Jabber server name.
Diffstat (limited to 'mcabber')
-rwxr-xr-xmcabber/build/mcabber.SlackBuild20
1 files changed, 15 insertions, 5 deletions
diff --git a/mcabber/build/mcabber.SlackBuild b/mcabber/build/mcabber.SlackBuild
index 6931c3be..f2cfd890 100755
--- a/mcabber/build/mcabber.SlackBuild
+++ b/mcabber/build/mcabber.SlackBuild
@@ -15,6 +15,8 @@
# * Initial build.
# 0.6.6-1: 18/Aug/2005 by Eric Hameleers <alien@sox.homeip.net>
# * New release
+# 0.7.3-1: 13/jan/2006 by Eric Hameleers <alien@slackware.com>
+# * New release
#
# Run 'sh SlackBuild --cleanup' to build a Slackware package.
# The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -30,7 +32,7 @@ if [ "$TMP" = "" ]; then
fi
PRGNAM=mcabber
-VERSION=0.6.6
+VERSION=0.7.3
ARCH=${ARCH:-i486}
BUILD=1
@@ -110,9 +112,9 @@ mv $PKG/usr/bin/mcabber $PKG/usr/bin/mcabber.bin
cat <<EEOOTT > $PKG/usr/bin/mcabber
#!/bin/sh
#
-# Wrapper script, sets up a mcabberrc file if none exists.
+# Wrapper script for mcabber, sets up a mcabberrc file if none exists.
#
-# Eric Hameleers <alien@sox.homeip.net> | 17aug2005
+# Eric Hameleers <alien@slackware.com> | 13jan2006
#
if [ -f ~/.mcabberrc -o -f ~/.mcabber/mcabberrc ]; then
@@ -134,9 +136,16 @@ if [ \$? -ne 0 -o "\${YESNO:0:1}" = "N" -o "\${YESNO:0:1}" = "n" ]; then
exit 1
fi
-read -p "Your username: " JUSER
-read -p "Your Jabber server: " JSERVER
+read -p "Your Jabber ID (format: 'user@server'): " JUSER
+JSERVER=\${JUSER/#*@}
+read -p "Your Jabber server (\${JSERVER}): " DSERVER
+
+if ! [ "\$DSERVER" = "" ]; then
+ JSERVER=\$DSERVER
+fi
+
read -p "Use SSL (y/N): " JSSL
+
if [ "\${JSSL:0:1}" = "N" -o "\${JSSL:0:1}" = "n" -o "\${JSSL}" = "" ]; then
JSSL="0"
JPORT=5222
@@ -144,6 +153,7 @@ else
JSSL="1"
JPORT=5223
fi
+
echo -n "Port to connect at Jabber server \$JSERVER (\${JPORT}): "
read DPORT