Changeset 13160 for modules/branches/2.10/package.php
- Timestamp:
- 01/04/12 10:19:05 (1 year ago)
- Files:
-
- modules/branches/2.10/package.php (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
modules/branches/2.10/package.php
r13126 r13160 100 100 $vars['checkphp'] = false; 101 101 unset($vars['L']); 102 } elseif ( isset($vars['checkphp']) && $vars['checkphp'] != 'false') {102 } elseif (!isset($vars['checkphp']) || isset($vars['checkphp']) && $vars['checkphp'] != 'false') { 103 103 $vars['checkphp'] = true; 104 104 } … … 119 119 } 120 120 121 $vars['svn_q'] = $vars['debug'] || $vars['verbose'] ? '' : ' --quiet '; 121 122 //set re 122 123 //move re to an array if there are commas as part of the value … … 189 190 190 191 //ensure the module and release directorys are up to date 191 run_cmd('svn up ' . $vars[' reldir'] . ' . ');192 run_cmd('svn up ' . $vars['svn_q'] . $vars['reldir'] . ' . '); 192 193 193 194 foreach ($vars['module'] as $mod) { … … 305 306 run_cmd('svn st ' . $mod_dir . '|wc -l', $lines); 306 307 if ( $lines > 0) { 307 run_cmd('svn ci -m "[Auto Check-in of any outstanding changes in ' . $mod . '] ' . $vars['msg'] . '" ' . $mod_dir);308 run_cmd('svn ci ' . $vars['svn_q'] . '-m "[Auto Check-in of any outstanding changes in ' . $mod . '] ' . $vars['msg'] . '" ' . $mod_dir); 308 309 } 309 310 … … 361 362 362 363 //add tarball to release repository 363 run_cmd('svn add ' . $vars['reldir'] . '/' . $filename );364 run_cmd('svn add ' . $vars['reldir'] . '/' . $filename . ' ' . $vars['svn_q']); 364 365 365 366 //set mimetype of tarball 366 run_cmd('svn ps svn:mime-type application/tgz ' . $vars['reldir'] . '/' . $filename );367 run_cmd('svn ps svn:mime-type application/tgz ' . $vars['reldir'] . '/' . $filename . ' ' . $vars['svn_q']); 367 368 368 369 //set latpublished property 369 370 run_cmd('svn info ' . $mod_dir . ' | grep Revision: | awk \'{print $2}\'', $lastpub, false, true); 370 run_cmd('svn ps lastpublish ' . $ lastpub . ' ' . $mod_dir);371 run_cmd('svn ps lastpublish ' . $vars['svn_q'] . $lastpub . ' ' . $mod_dir); 371 372 372 373 // appears we need to do an svn up here or it fails, maybe because of the propset above? 373 374 //Lets reaserch this more, SHMZ hasn't found this nesesary -MB 374 375 //+1 although I dont (either) get why -MB 375 run_cmd('svn up ' . $vars[' reldir'] . '/' . $filename . ' ' . $mod_dir);376 run_cmd('svn up ' . $vars['svn_q'] . $vars['reldir'] . '/' . $filename . ' ' . $mod_dir); 376 377 377 378 //check in new tarball and module.xml 378 run_cmd('svn ci ' . $ mod_dir . ' ' . $vars['reldir'] . '/' . $filename379 run_cmd('svn ci ' . $vars['svn_q'] . $mod_dir . ' ' . $vars['reldir'] . '/' . $filename 379 380 . ' -m"[Module package script: ' . $rawname . ' ' . $ver . '] ' . $vars['msg'] . '"'); 380 381 … … 391 392 392 393 //print report 393 echo PHP_EOL . PHP_EOL . PHP_EOL . PHP_EOL . PHP_EOL;394 echo PHP_EOL . PHP_EOL . PHP_EOL; 394 395 echo 'Package Script Report:' . PHP_EOL; 395 396 echo '---------------------' . PHP_EOL;
