Merge branch 'master' of gitorious.org:social/mainline

[quix0rs-gnu-social.git] / scripts / setup_status_network.sh

diff --git a/scripts/setup_status_network.sh b/scripts/setup_status_network.sh
index d468df3aeb1e6ba24b79abe49dd1a6f89d3922f2..e801efaa27c8bd18dbbd48b4cb6b3fd5378b91c4 100755 (executable)
--- a/scripts/setup_status_network.sh
+++ b/scripts/setup_status_network.sh
@@ -1,13 +1,23 @@
 #!/bin/bash
 
+# live fast! die young!
+
+set -e
+
 source /etc/statusnet/setup.cfg
 
-# setup_status_net.sh mysite 'My Site' 'owner@example.com' '1user'
+# setup_status_network.sh mysite 'My Site' '1user' 'owner@example.com' 'Firsty McLastname'
 
 export nickname="$1"
 export sitename="$2"
-export email="$3"
-export tags="$4"
+export tags="$3"
+export email="$4"
+export fullname="$5"
+export siteplan="$6"
+
+if [ "$siteplan" == '' ]; then
+    siteplan='single-user'
+fi
 
 # Fixme: if this is changed later we need to update profile URLs
 # for the created user.
@@ -34,8 +44,8 @@ mysql -h $DBHOST -u $ADMIN --password=$ADMINPASS $SITEDB << ENDOFCOMMANDS
 
 GRANT ALL ON $database.* TO '$username'@'localhost' IDENTIFIED BY '$password';
 GRANT ALL ON $database.* TO '$username'@'%' IDENTIFIED BY '$password';
-INSERT INTO status_network (nickname, dbhost, dbuser, dbpass, dbname, sitename, created, tags)
-VALUES ('$nickname', '$DBHOSTNAME', '$username', '$password', '$database', '$sitename', now(), '$tags');
+INSERT INTO status_network (nickname, dbhost, dbuser, dbpass, dbname, sitename, created)
+VALUES ('$nickname', '$DBHOSTNAME', '$username', '$password', '$database', '$sitename', now());
 
 ENDOFCOMMANDS
 
@@ -44,9 +54,14 @@ for top in $AVATARBASE $FILEBASE $BACKGROUNDBASE; do
     chmod a+w $top/$nickname
 done
 
+php $PHPBASE/scripts/checkschema.php -s"$server"
+
+php $PHPBASE/scripts/settag.php -s"$server" "$nickname" "$tags"
+
 php $PHPBASE/scripts/registeruser.php \
   -s"$server" \
   -n"$nickname" \
+  -f"$fullname" \
   -w"$userpass" \
   -e"$email"
 
@@ -65,6 +80,7 @@ then
       sed "s/\$nickname/$nickname/" | \
       sed "s/\$sitename/$sitename/" | \
       sed "s/\$userpass/$userpass/" | \
+      sed "s/\$siteplan/$siteplan/" | \
       php $PHPBASE/scripts/sendemail.php \
         -s"$server" \
         -n"$nickname" \
@@ -72,3 +88,9 @@ then
 else
     echo "No mail template, not sending email."
 fi
+
+if [ -f "$POSTINSTALL" ]
+then
+    echo "Running $POSTINSTALL ..."
+    source "$POSTINSTALL"
+fi