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

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

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

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

    • Property svnmerge-integrated changed from /modules/branches/2.4:1-5852,5908,10820 /modules/branches/2.6:1-7080,7132,7158-7174,7177,7179-7186,7191-7202,7204-7226,7228-7250,7252-7273,7279-7286,7289-7292,7294-7295,7297-7312,7317-7331,7333-7340,7411,7413,7415-7417,7419-7420,7423-7434,7438-7439,7441-7442,7444-7446,7458-7469,7553,7609-7622,7697,7699-7701,7703-7707,7709-7710,7713-7722,7725-7731,7735-7736,7739-7740,7744-7751,7753-7759,7761-7774,7776-7787,7789-7791,7793-7795,7798,7806-7809,7811-7813,7816,7818-7821,7838,7858-7867,7871,7874-7882,7886-7893,7895-7896,7901,8589,8613,8620,8651,8672,8691,8710,8822,8884,9220,10301,10341,10393,10421,10460,10519 to /modules/branches/2.6:1-7080,7132,7158-7174,7177,7179-7186,7191-7202,7204-7226,7228-7250,7252-7273,7279-7286,7289-7292,7294-7295,7297-7312,7317-7331,7333-7340,7411,7413,7415-7417,7419-7420,7423-7434,7438-7439,7441-7442,7444-7446,7458-7469,7553,7609-7622,7697,7699-7701,7703-7707,7709-7710,7713-7722,7725-7731,7735-7736,7739-7740,7744-7751,7753-7759,7761-7774,7776-7787,7789-7791,7793-7795,7798,7806-7809,7811-7813,7816,7818-7821,7838,7858-7867,7871,7874-7882,7886-7893,7895-7896,7901,8589,8613,8620,8651,8672,8691,8710,8822,8884,9220,10301,10341,10393,10421,10460,10519,10860 /modules/branches/2.4:1-5852,5908,10820
  • modules/branches/2.5/publish.pl

    r7531 r10861  
    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; 
     
    288300  system("tar zcf $filename --exclude .svn $rawname"); 
    289301  # Update the md5 info 
    290   open MD5, "md5sum $filename|"; 
     302  open MD5, "$md5_command $filename|"; 
    291303  $md5 = <MD5>; 
    292304  close MD5;