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

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

........

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

    • Property svnmerge-integrated changed from /modules/branches/2.6:1-8497,8589,8613,8620,8651,8672,9414-9416,9752,9773,10822 /modules/branches/2.8:1-9044,9047,9049-9054,9056-9070,9072-9073,9075,9079-9080,9082-9085,9088-9089,9092-9093,9095-9098,9102,9105,9107-9123,9127-9128,9130-9132,9137,9149-9204,9211-9214,9216,9218-9224,9230-9232,9234,9237-9239,9248-9252,9257-9262,9267-9270,9272-9274,9277-9278,9280,9282,9288-9292,9295,9297,9300-9324,9326-9327,9329-9342,9345-9349,9353-9354,9358,9363-9376,9378-9379,9385,9387-9389,9392-9393,9395-9405,9407-9408,9410,9414-9421,9423-9424,9440,9442,9446-9449,9451-9452,9454-9458,9460-9462,9464-9469,9474-9475,9483-9484,9486,9489,9495,9500-9502,9504,9508,9607,9845,9880,9976,10020-10021,10299,10338,10391,10418,10432,10456,10517,10659-10664,10691,10697 to /modules/branches/2.8:1-9044,9047,9049-9054,9056-9070,9072-9073,9075,9079-9080,9082-9085,9088-9089,9092-9093,9095-9098,9102,9105,9107-9123,9127-9128,9130-9132,9137,9149-9204,9211-9214,9216,9218-9224,9230-9232,9234,9237-9239,9248-9252,9257-9262,9267-9270,9272-9274,9277-9278,9280,9282,9288-9292,9295,9297,9300-9324,9326-9327,9329-9342,9345-9349,9353-9354,9358,9363-9376,9378-9379,9385,9387-9389,9392-9393,9395-9405,9407-9408,9410,9414-9421,9423-9424,9440,9442,9446-9449,9451-9452,9454-9458,9460-9462,9464-9469,9474-9475,9483-9484,9486,9489,9495,9500-9502,9504,9508,9607,9845,9880,9976,9998,10020-10021,10299,10338,10391,10418,10432,10456,10517,10659-10664,10691,10697 /modules/branches/2.6:1-8497,8589,8613,8620,8651,8672,9414-9416,9752,9773,10822
  • modules/branches/2.7/publish.pl

    r10693 r10859  
    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; 
     
    298310  system("tar zcf $filename --exclude .svn $rawname"); 
    299311  # Update the md5 info 
    300   open MD5, "md5sum $filename|"; 
     312  open MD5, "$md5_command $filename|"; 
    301313  $md5 = <MD5>; 
    302314  close MD5;