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

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

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

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.4

    • Property svnmerge-integrated changed from /modules/branches/2.3:1-5233,5245,5333,5336 /modules/branches/2.5:1-5852,5880,5930,5995,6016-6017,6030-6031,6142,6218,6291,6361,6363,6413-6414,6422,6428-6430,6442-6443,6557,6710,6714-6715,6969-6970,6984,7248,7281,7858-7859,7875,7878,7886,7890,8615,8622,10302,10342,10461,10520 to /modules/branches/2.5:1-5852,5880,5930,5995,6016-6017,6030-6031,6142,6218,6291,6361,6363,6413-6414,6422,6428-6430,6442-6443,6557,6710,6714-6715,6969-6970,6984,7248,7281,7858-7859,7875,7878,7886,7890,8615,8622,10302,10342,10461,10520,10861 /modules/branches/2.3:1-5233,5245,5333,5336
  • modules/branches/2.4/publish.pl

    r5513 r10862  
    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;