cookutils rev 486

cooker: Replace 'echo ' with newline function. Check if file $crontabs exists before using fgrep on it.
author Christopher Rogers <slaxemulator@gmail.com>
date Mon Jun 11 16:44:10 2012 +0000 (2012-06-11)
parents 3ff0467577c7
children 3fbfcf812669
files cooker
line diff
     1.1 --- a/cooker	Mon Jun 11 16:42:09 2012 +0000
     1.2 +++ b/cooker	Mon Jun 11 16:44:10 2012 +0000
     1.3 @@ -251,7 +251,7 @@
     1.4  		hg clone $WOK_URL ${wok}-hg || exit 1
     1.5  		[ -d "$flavors" ] || hg clone $FLAVORS_URL flavors
     1.6  		cp -a ${wok}-hg $wok
     1.7 -		separator && echo "" ;;
     1.8 +		separator && newline ;;
     1.9  	arch-db)
    1.10  		# Manually create arch packages DB.
    1.11  		arch_db ;;
    1.12 @@ -267,6 +267,8 @@
    1.13  			killall crond 2>/dev/null && /etc/init.d/crond start
    1.14  		fi ;;
    1.15  	check-cron)
    1.16 +		[ -f "$crontabs" ] || \
    1.17 +			echo "There is no $crontabs here. Use setup-cron option." && exit 1
    1.18  		fgrep /usr/bin/cooker $crontabs ;;
    1.19  	note|-n)
    1.20  		# Blocked a pkg and want others to know why ? Post a note!
    1.21 @@ -278,7 +280,7 @@
    1.22  		echo -e "\nCooknotes"
    1.23  		separator
    1.24  		cat $cooknotes
    1.25 -		separator && echo "" ;;
    1.26 +		separator && newline ;;
    1.27  	block|-b)
    1.28  		# Block a package.
    1.29  		[ "$pkg" ] && cook $pkg --block ;;
    1.30 @@ -359,7 +361,7 @@
    1.31  		# Try to build all unbuilt packages except blocked's.
    1.32  		echo "cooker:all" > $command
    1.33  		rm -f $cooklist && touch $cooklist
    1.34 -		echo "" && cd $wok
    1.35 +		newline && cd $wok
    1.36  		echo "Cooker cooklist"
    1.37  		separator
    1.38  
    1.39 @@ -396,7 +398,7 @@
    1.40  
    1.41  		# Start and get a PID file.
    1.42  		rm -f $LOGS/commits.log
    1.43 -		echo ""
    1.44 +		newline
    1.45  		echo "Checking for commits" | log_commits
    1.46  		separator | tee -a $LOGS/commits.log
    1.47  
    1.48 @@ -430,7 +432,7 @@
    1.49  		else
    1.50  			echo "No revision changes: $cur vs $new" | log
    1.51  			separator | log_commits
    1.52 -			clean_exit && echo "" && exit 0
    1.53 +			clean_exit && newline && exit 0
    1.54  		fi
    1.55  
    1.56  		# Get and display modifications.
    1.57 @@ -490,7 +492,7 @@
    1.58  		echo "Packages to cook: $pkgs" | log
    1.59  		echo "Packages to cook : $pkgs" | log_commits
    1.60  		separator | log_commits
    1.61 -		echo ""
    1.62 +		newline
    1.63  		strip_blocked
    1.64  		cook_order | tee $LOGS/cookorder.log
    1.65  		cook_commits