[asterisk-commits] pabelanger: branch pabelanger/issue17165 r257260 - /team/pabelanger/issue1716...

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Wed Apr 14 14:44:33 2010
New Revision: 257260

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=257260
Log:
* Create a new setting 'testsuite' to all for non-root builds.


Modified:
    team/pabelanger/issue17165/contrib/scripts/live_ast

Modified: team/pabelanger/issue17165/contrib/scripts/live_ast
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue17165/contrib/scripts/live_ast?view=diff&rev=257260&r1=257259&r2=257260
==============================================================================
--- team/pabelanger/issue17165/contrib/scripts/live_ast (original)
+++ team/pabelanger/issue17165/contrib/scripts/live_ast Wed Apr 14 14:44:33 2010
@@ -114,6 +114,13 @@
 LIVE_CONF="$BASE_DIR/live.conf"
 DISABLED_MODS="chan_h323 pbx_dundi"
 DISABLED_MODS_FILE="modules-disabled.conf"
+
+update_conf() {
+  sed -r -s \
+    -e "/^;ast(etc|mod|varlib|data|agi|run|spool|log|db|key)dir\>/s| /| $BASE_DIR/|" \
+    -e "s/^;ast(etc|mod|varlib|data|agi|run|spool|log|db|key)dir/ast\1dir/" \
+    "$AST_CONF" > "$AST_CONF".tmp && mv "$AST_CONF".tmp "$AST_CONF"
+}
 
 if [ -r "$LIVE_CONF" ]; then . "$LIVE_CONF"; fi
 
@@ -188,19 +195,19 @@
 install)
   make install DESTDIR="$BASE_DIR" "$@"
   ;;
+testsuite)
+  make install samples DESTDIR="$BASE_DIR" "$@"
+  update_conf
+  ;;
 samples)
   make samples DESTDIR="$BASE_DIR" "$@"
-  sed -r -i \
-    -e '/^\[directories\]\(!\)/s/\(!\).*//' \
-    -e "/^\[directories\]/a; rem-out any of the following to use Asterisk's defaults:" \
-    -e "/^ast(etc|mod|varlib|data|agi|run|spool|log|db|key)dir\>/s| /| $BASE_DIR/|" \
-    "$AST_CONF"
-  if [ "$LIVE_AST_FOR_SYSTEM" != '' ]; then
-    sed -r -i \
-      -e "/^ast(etc|varlib|data|agi|run|spool|log|db|key)dir\>/s|^|;|" \
-      -e "/^;astrundir\>/aastrundir    => /var/run/asterisk" \
-      "$AST_CONF"
-  fi
+  update_conf
+#  if [ "$LIVE_AST_FOR_SYSTEM" != '' ]; then
+#    sed -r -i \
+#      -e "/^ast(etc|varlib|data|agi|run|spool|log|db|key)dir\>/s|^|;|" \
+#      -e "/^;astrundir\>/aastrundir    => /var/run/asterisk" \
+#      "$AST_CONF"
+#  fi
   # disable some modules that bind on a port that is already in use by a
   # main Asterisk copy, and would crash asterisk in failing:
   rm -f "$AST_CONF_DIR/$DISABLED_MODS_FILE"
@@ -244,6 +251,7 @@
   echo "$0 run [params]         asterisk [params]"
   echo "$0 gdb                  gdb asterisk"
   echo "$0 conf-file            create live.conf if it does exist"
+  echo "$0 testsuite            Asterisk testsuite install" 
   exit 1
   ;;
 esac