[Astlinux-commits] SF.net SVN: astlinux:[6775] branches/1.0

[<abe...@us...>]

Revision: 6775
          http://sourceforge.net/p/astlinux/code/6775
Author:   abelbeck
Date:     2014-10-22 20:06:49 +0000 (Wed, 22 Oct 2014)
Log Message:
-----------
fop2, version bump to 2.28, add 'service fop2 test' and automaticaly copy any fop2.lic file

Modified Paths:
--------------
    branches/1.0/package/asterisk-fop2/asterisk-fop2.mk
    branches/1.0/package/asterisk-fop2/fop2.init
    branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package

Modified: branches/1.0/package/asterisk-fop2/asterisk-fop2.mk
===================================================================
--- branches/1.0/package/asterisk-fop2/asterisk-fop2.mk	2014-10-20 18:57:06 UTC (rev 6774)
+++ branches/1.0/package/asterisk-fop2/asterisk-fop2.mk	2014-10-22 20:06:49 UTC (rev 6775)
@@ -3,7 +3,7 @@
 # asterisk-fop2
 #
 #############################################################
-ASTERISK_FOP2_VERSION = 2.27
+ASTERISK_FOP2_VERSION = 2.28
 ASTERISK_FOP2_SOURCE = fop2-$(ASTERISK_FOP2_VERSION)-debian-i386.tgz
 ASTERISK_FOP2_SITE = http://download.fop2.com
 # Note: be sure to edit "project/astlinux/target_skeleton/usr/sbin/upgrade-package" on version change
@@ -13,6 +13,8 @@
 	$(INSTALL) -D -m 0644 package/asterisk-fop2/config/fop2.cfg $(TARGET_DIR)/stat/etc/fop2/fop2.cfg
 	$(INSTALL) -D -m 0644 package/asterisk-fop2/config/buttons.cfg $(TARGET_DIR)/stat/etc/fop2/buttons.cfg
 	$(INSTALL) -D -m 0644 package/asterisk-fop2/config/users.cfg $(TARGET_DIR)/stat/etc/fop2/users.cfg
+	mkdir -p $(TARGET_DIR)/usr/local
+	ln -snf /stat/var/packages/fop2/server $(TARGET_DIR)/usr/local/fop2
 	ln -snf /tmp/etc/fop2 $(TARGET_DIR)/etc/fop2
 	ln -sf ../../init.d/fop2 $(TARGET_DIR)/etc/runlevels/default/S98fop2
 	ln -sf ../../init.d/fop2 $(TARGET_DIR)/etc/runlevels/default/K00fop2

Modified: branches/1.0/package/asterisk-fop2/fop2.init
===================================================================
--- branches/1.0/package/asterisk-fop2/fop2.init	2014-10-20 18:57:06 UTC (rev 6774)
+++ branches/1.0/package/asterisk-fop2/fop2.init	2014-10-22 20:06:49 UTC (rev 6775)
@@ -63,6 +63,25 @@
   fi
 }
 
+dotest () {
+  local restart
+
+  if [ -f $PIDFILE ]; then
+    restart=1
+    stop
+  else
+    restart=0
+    init
+  fi
+  if [ -f /etc/fop2/fop2.cfg ]; then
+    echo "Testing Asterisk FOP2..."
+    $FOP2_SERVER --test -c /etc/fop2
+  fi
+  if [ $restart -eq 1 ]; then
+    start
+  fi
+}
+
 case $1 in
 
 start)
@@ -88,8 +107,12 @@
   reload
   ;;
 
+test)
+  dotest
+  ;;
+
 *)
-  echo "Usage: start|stop|restart|reload"
+  echo "Usage: start|stop|restart|reload|test"
   ;;
 
 esac

Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package	2014-10-20 18:57:06 UTC (rev 6774)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package	2014-10-22 20:06:49 UTC (rev 6775)
@@ -95,6 +95,21 @@
   fi
 }
 
+upgrade_config() {
+  local file IFS
+
+  case $PKG in
+    fop2)
+      unset IFS
+      for file in server/fop2.lic; do
+        if [ -f "$BASE/$PKG-OLD/$file" ] && [ ! -f "$BASE/$PKG/$file" ]; then
+          cp "$BASE/$PKG-OLD/$file" "$BASE/$PKG/$file"
+        fi
+      done
+      ;;
+  esac
+}
+
 revert() {
 
   if [ ! -d $BASE/$PKG ]; then
@@ -196,7 +211,7 @@
   if ! RAM_needed_MB 475; then
     finish $RED "Not enough RAM installed. Minimum: 512 MB, Recommended: 1024+ MB"
   fi
-  SRC_URL="http://files.astlinux.org/fop2-2.27-debian-i386.tgz"
+  SRC_URL="http://files.astlinux.org/fop2-2.28-debian-i386.tgz"
   ;;
 
 show)
@@ -220,6 +235,7 @@
     SRC_URL=$2
   fi
   upgrade
+  upgrade_config
   finish $GREEN "Successful package '$PKG' upgrade, '$PKG' is not running."
   ;;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.