# HG changeset patch # User Christopher Rogers # Date 1339433050 0 # Node ID 84b03e953f0951ad68c6e0d9200024b3936fc7df # Parent 3ff0467577c7f8eb236ba36921b99121c061dac1 cooker: Replace 'echo ' with newline function. Check if file $crontabs exists before using fgrep on it. diff -r 3ff0467577c7 -r 84b03e953f09 cooker --- a/cooker Mon Jun 11 16:42:09 2012 +0000 +++ b/cooker Mon Jun 11 16:44:10 2012 +0000 @@ -251,7 +251,7 @@ hg clone $WOK_URL ${wok}-hg || exit 1 [ -d "$flavors" ] || hg clone $FLAVORS_URL flavors cp -a ${wok}-hg $wok - separator && echo "" ;; + separator && newline ;; arch-db) # Manually create arch packages DB. arch_db ;; @@ -267,6 +267,8 @@ killall crond 2>/dev/null && /etc/init.d/crond start fi ;; check-cron) + [ -f "$crontabs" ] || \ + echo "There is no $crontabs here. Use setup-cron option." && exit 1 fgrep /usr/bin/cooker $crontabs ;; note|-n) # Blocked a pkg and want others to know why ? Post a note! @@ -278,7 +280,7 @@ echo -e "\nCooknotes" separator cat $cooknotes - separator && echo "" ;; + separator && newline ;; block|-b) # Block a package. [ "$pkg" ] && cook $pkg --block ;; @@ -359,7 +361,7 @@ # Try to build all unbuilt packages except blocked's. echo "cooker:all" > $command rm -f $cooklist && touch $cooklist - echo "" && cd $wok + newline && cd $wok echo "Cooker cooklist" separator @@ -396,7 +398,7 @@ # Start and get a PID file. rm -f $LOGS/commits.log - echo "" + newline echo "Checking for commits" | log_commits separator | tee -a $LOGS/commits.log @@ -430,7 +432,7 @@ else echo "No revision changes: $cur vs $new" | log separator | log_commits - clean_exit && echo "" && exit 0 + clean_exit && newline && exit 0 fi # Get and display modifications. @@ -490,7 +492,7 @@ echo "Packages to cook: $pkgs" | log echo "Packages to cook : $pkgs" | log_commits separator | log_commits - echo "" + newline strip_blocked cook_order | tee $LOGS/cookorder.log cook_commits