Changeset 10863

Show
Ignore:
Timestamp:
01/09/11 11:32:58 (2 years ago)
Author:
p_lindheimer
Message:

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

................

r9998 | p_lindheimer | 2010-06-29 13:45:58 -0700 (Tue, 29 Jun 2010) | 1 line


modify publish.pl to work on OSX also

................

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/branches/2.3

    • Property svnmerge-integrated changed from /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092,4098,4265,4285 /modules/branches/2.4:1-5079,5090,5093,5097-5118,5120-5170,5172,5174,5176-5182,5184-5199,5202-5203,5205-5211,5239,5271-5272,5312,5383,5516,5544-5545,5548-5549,5555,5564,5570,5572-5574,5576-5578,5596,5606-5610,5612,5615-5618,5623-5624,5628,5630-5642,5644-5646,5648-5651,5653-5654,5656-5657,5660,5687-5699,5701-5702,5704-5715,5723-5727,5729-5730,5733-5741,5752-5753,5756,5830-5831,5842-5843,5881,6280,7876,7881,7887,7892,10303,10343,10462 to /modules/branches/2.4:1-5079,5090,5093,5097-5118,5120-5170,5172,5174,5176-5182,5184-5199,5202-5203,5205-5211,5239,5271-5272,5312,5383,5516,5544-5545,5548-5549,5555,5564,5570,5572-5574,5576-5578,5596,5606-5610,5612,5615-5618,5623-5624,5628,5630-5642,5644-5646,5648-5651,5653-5654,5656-5657,5660,5687-5699,5701-5702,5704-5715,5723-5727,5729-5730,5733-5741,5752-5753,5756,5830-5831,5842-5843,5881,6280,7876,7881,7887,7892,10303,10343,10462,10862 /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092,4098,4265,4285
  • modules/branches/2.3/publish.pl

    r5130 r10863  
    55#              lose work. 
    66# 
     7system("which md5sum"); # typical linux format 
     8if ($? == 0) { 
     9    $md5_command = 'md5sum'; 
     10} else { 
     11  system("which md5"); # OSX format 
     12  if ($? == 0) { 
     13    $md5_command = 'md5 -r'; 
     14  } else { 
     15    die "no md5sum command\n"; 
     16  } 
     17} 
     18 
    719$debug = 0; 
    820$checkphp = 1; 
     
    143155  system("tar zcf $filename --exclude .svn $rawname"); 
    144156  # Update the md5 info 
    145   open MD5, "md5sum $filename|"; 
     157  open MD5, "$md5_command $filename|"; 
    146158  $md5 = <MD5>; 
    147159  close MD5;