cookutils diff cooker @ rev 480
cook: Fixed what needs sourcing.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Mon Jun 11 12:13:37 2012 +0000 (2012-06-11) |
parents | 71450d322f7b |
children | 2fe7f7a1becd 84b03e953f09 |
line diff
1.1 --- a/cooker Sat May 19 04:47:53 2012 +0200 1.2 +++ b/cooker Mon Jun 11 12:13:37 2012 +0000 1.3 @@ -6,25 +6,11 @@ 1.4 # here since it's not an end user tool and it's not useful, all devs should 1.5 # at least understand basic English. 1.6 # 1.7 - 1.8 -[ -f "/etc/slitaz/cook.conf" ] && . /etc/slitaz/cook.conf 1.9 -[ -f "cook.conf" ] && . ./cook.conf 1.10 +. /usr/lib/slitaz/libcook.sh 1.11 1.12 # Set pkg name and use same wok as cook. 1.13 pkg="$2" 1.14 wok="$WOK" 1.15 -flavors="$SLITAZ/flavors" 1.16 - 1.17 -# Cooker DB files. 1.18 -activity="$CACHE/activity" 1.19 -commits="$CACHE/commits" 1.20 -cooklist="$CACHE/cooklist" 1.21 -cookorder="$CACHE/cookorder" 1.22 -command="$CACHE/command" 1.23 -blocked="$CACHE/blocked" 1.24 -broken="$CACHE/broken" 1.25 -cooknotes="$CACHE/cooknotes" 1.26 -crontabs="/var/spool/cron/crontabs/root" 1.27 1.28 # PID file. 1.29 pidfile='/var/run/cooker.pid' 1.30 @@ -58,33 +44,12 @@ 1.31 exit 0 1.32 } 1.33 1.34 -separator() { 1.35 - echo "================================================================================" 1.36 -} 1.37 - 1.38 -# Lograte activity. 1.39 -[ -s "$activity" ] && tail -n 60 $activity > /tmp/tail && \ 1.40 - mv -f /tmp/tail $activity 1.41 - 1.42 -# Log activities, we want first letter capitalized. 1.43 -log() { 1.44 - grep ^[A-Z] | \ 1.45 - sed s"#^[A-Z]\([^']*\)#$(date '+%Y-%m-%d %H:%M') : \0#" >> $activity 1.46 -} 1.47 - 1.48 # Some messages occur in activity but log verbose output when checking for commits 1.49 # into a log file. 1.50 log_commits() { 1.51 sed '/^.\//'d | sed '/^.hg/'d | tee -a $LOGS/commits.log 1.52 } 1.53 1.54 -# Log broken packages. 1.55 -broken() { 1.56 - if ! grep -q "^$pkg$" $broken; then 1.57 - echo "$pkg" >> $broken 1.58 - fi 1.59 -} 1.60 - 1.61 # Clean up before exit when check and cook commits finish. 1.62 clean_exit() { 1.63 rm -f $command && touch $command