Changeset 11510

Show
Ignore:
Timestamp:
02/20/11 19:00:39 (2 years ago)
Author:
p_lindheimer
Message:

Merged revisions 11509 via svnmerge from
http://www.freepbx.org/v2/svn/modules/branches/2.9

........

r11509 | p_lindheimer | 2011-02-20 15:59:27 -0800 (Sun, 20 Feb 2011) | 1 line


remove non numerics form version info in sed

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.8

    • Property svnmerge-integrated changed from /modules/branches/2.7:1-9074,9105,10001,10196,10253,10264,10295,10355,10399-10422,10424-10426,10428-10430,10432-10433,10436-10458,10628,10802,10816,10823,10869,10875-10876 /modules/branches/2.9:1-10122,10411-10428,10430-10440,10442-10444,10447,10449-10451,10453-10510,10512-10526,10529-10533,10536-10539,10542-10543,10545-10549,10556-10564,10572-10576,10578-10581,10597-10599,10602,10605,10607,10611,10658,10690,10771,11295,11327,11370 to /modules/branches/2.9:1-10122,10411-10428,10430-10440,10442-10444,10447,10449-10451,10453-10510,10512-10526,10529-10533,10536-10539,10542-10543,10545-10549,10556-10564,10572-10576,10578-10581,10597-10599,10602,10605,10607,10611,10658,10690,10771,11295,11327,11370,11509 /modules/branches/2.7:1-9074,9105,10001,10196,10253,10264,10295,10355,10399-10422,10424-10426,10428-10430,10432-10433,10436-10458,10628,10802,10816,10823,10869,10875-10876

  • modules/branches/2.8/frameworksvn.pl

    r9748 r11510  
    3131  system("tar -zxOf ".$filename." ".$moddir."/svnversion.txt"); 
    3232  print "Geting svn log since that version for $rver : .... \n\n"; 
    33   $svnver = system("svn log http://svn.freepbx.org/freepbx/$fwbranch -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION://`:HEAD"); 
    34  
     33  $svnver = system("svn log http://svn.freepbx.org/freepbx/$fwbranch -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION:// | tr -cd '0-9'`:HEAD"); 

  • modules/branches/2.8/fw_arisvn.pl

    r9748 r11510  
    3131  system("tar -zxOf ".$filename." ".$moddir."/svnversion.txt"); 
    3232  print "Geting svn log since that version for $rver : .... \n\n"; 
    33   $svnver = system("svn log http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/htdocs/recordings -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION://`:HEAD"); 
     33  $svnver = system("svn log http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/htdocs/recordings -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION:// | tr -cd '0-9'`:HEAD"); 
    3434 

  • modules/branches/2.8/fw_fopsvn.pl

    r10438 r11510  
    3131  system("tar -zxOf ".$filename." ".$moddir."/svnversion.txt"); 
    3232  print "Geting svn log since that version for $rver : .... \n\n"; 
    33   $svnver = system("svn log http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/htdocs_panel -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION://`:HEAD"); 
    34   $svnver = system("svn log http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/bin/retrieve_op_conf_from_mysql.php -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION://`:HEAD"); 
     33  $svnver = system("svn log http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/htdocs_panel -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION:// | tr -cd '0-9'`:HEAD"); 
     34  $svnver = system("svn log http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/bin/retrieve_op_conf_from_mysql.php -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION:// | tr -cd '0-9'`:HEAD"); 

  • modules/branches/2.8/fw_langpackssvn.pl

    r9748 r11510  
    3131  system("tar -zxOf ".$filename." ".$moddir."/svnversion.txt"); 
    3232  print "Geting svn log of language updates since that version for $rver : .... \n\n"; 
    33   system("svn log http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/htdocs/recordings/locale -v -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION://`:HEAD | grep 'htdocs/recordings/locale'"); 
    34   system("svn log http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/htdocs/admin -v -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION://`:HEAD | grep 'i18n/' | grep 'htdocs/admin'"); 
    35   system("svn log http://svn.freepbx.org/modules/branches/$rver -v -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION://`:HEAD | grep 'i18n/' | grep 'modules/branches'"); 
     33  system("svn log http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/htdocs/recordings/locale -v -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION:// | tr -cd '0-9'`:HEAD | grep 'htdocs/recordings/locale'"); 
     34  system("svn log http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/htdocs/admin -v -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION:// | tr -cd '0-9'`:HEAD | grep 'i18n/' | grep 'htdocs/admin'"); 
     35  system("svn log http://svn.freepbx.org/modules/branches/$rver -v -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION:// | tr -cd '0-9'`:HEAD | grep 'i18n/' | grep 'modules/branches'"); 
    3636 
    3737