assorted-commits

[Assorted-commits] SF.net SVN: assorted: [792] configs/trunk/setup-cron.bash

[<yan...@us...>]

Revision: 792
          http://assorted.svn.sourceforge.net/assorted/?rev=792&view=rev
Author:   yangzhang
Date:     2008-05-11 12:18:40 -0700 (Sun, 11 May 2008)

Log Message:
-----------
added check for a cooperative .bashrc (since these are loaded by the cron scripts)

Modified Paths:
--------------
    configs/trunk/setup-cron.bash

Modified: configs/trunk/setup-cron.bash
===================================================================
--- configs/trunk/setup-cron.bash	2008-05-10 05:46:06 UTC (rev 791)
+++ configs/trunk/setup-cron.bash	2008-05-11 19:18:40 UTC (rev 792)
@@ -17,3 +17,15 @@
 then crontab - < crontab
 else warn "crontab already exists; not overwriting."
 fi
+
+if fgrep PS1 ~/.bashrc && ! fgrep ~/.bashrc FORCE_BASHRC ~/.bashrc ; then
+  # NOTE: do not try to use "$( ... )" here instead of backticks, since that
+  # will break this!
+  warn "` cat << "EOF"
+Ensure that your bashrc doesn't guard against non-interactive shells or, if it
+does, that it responds to FORCE_BASHRC.  For instance, on Ubuntu:
+
+  [[ -z "$PS1" && -z "$FORCE_BASHRC" ]] && return
+EOF
+`"
+fi


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Assorted-commits] SF.net SVN: assorted: [796] configs/trunk/setup-cron.bash

[<yan...@us...>]

Revision: 796
          http://assorted.svn.sourceforge.net/assorted/?rev=796&view=rev
Author:   yangzhang
Date:     2008-05-13 00:31:00 -0700 (Tue, 13 May 2008)

Log Message:
-----------
check prereqs in setup-cron

Modified Paths:
--------------
    configs/trunk/setup-cron.bash

Modified: configs/trunk/setup-cron.bash
===================================================================
--- configs/trunk/setup-cron.bash	2008-05-13 07:30:41 UTC (rev 795)
+++ configs/trunk/setup-cron.bash	2008-05-13 07:31:00 UTC (rev 796)
@@ -13,6 +13,14 @@
 
 install .cron/ cron/!(crontab)
 
+silence type duplicity
+silence type gbookmark2delicious.py
+[ -f ~/.gbookmark2delicious.auth ]
+silence type mlf.py
+[ -f ~/.mlf.auth ]
+silence type mysqldump
+[ -f ~/.y_z.cnf ]
+
 if ! silence crontab -l
 then crontab - < crontab
 else warn "crontab already exists; not overwriting."


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Assorted-commits] SF.net SVN: assorted: [802] configs/trunk/setup-cron.bash

[<yan...@us...>]

Revision: 802
          http://assorted.svn.sourceforge.net/assorted/?rev=802&view=rev
Author:   yangzhang
Date:     2008-05-13 00:44:31 -0700 (Tue, 13 May 2008)

Log Message:
-----------
added informational output to prereq checking; fixed the bashrc checking; added final done output

Modified Paths:
--------------
    configs/trunk/setup-cron.bash

Modified: configs/trunk/setup-cron.bash
===================================================================
--- configs/trunk/setup-cron.bash	2008-05-13 07:43:35 UTC (rev 801)
+++ configs/trunk/setup-cron.bash	2008-05-13 07:44:31 UTC (rev 802)
@@ -2,7 +2,7 @@
 
 # Installs cron jobs.
 
-. common.bash
+. common.bash || exit 1
 
 shopt -s extglob
 
@@ -13,20 +13,28 @@
 
 install .cron/ cron/!(crontab)
 
-silence type duplicity
-silence type gbookmark2delicious.py
-[ -f ~/.gbookmark2delicious.auth ]
-silence type mlf.py
-[ -f ~/.mlf.auth ]
-silence type mysqldump
-[ -f ~/.y_z.cnf ]
+check() {
+  local arg="$1"
+  if [[ "${arg:0:1}" == / ]]
+  then [ -f "$arg" ] || die "could not find file $arg"
+  else silence type "$arg" || die "could not find proram $arg"
+  fi
+}
 
+check duplicity
+check gbookmark2delicious
+check ~/.gbookmark2delicious.auth
+check mlf.py
+check ~/.mlf.auth
+check mysqldump
+check ~/.y_z.cnf
+
 if ! silence crontab -l
 then crontab - < crontab
 else warn "crontab already exists; not overwriting."
 fi
 
-if fgrep PS1 ~/.bashrc && ! fgrep ~/.bashrc FORCE_BASHRC ~/.bashrc ; then
+if silence fgrep PS1 ~/.bashrc && ! silence fgrep FORCE_BASHRC ~/.bashrc ; then
   # NOTE: do not try to use "$( ... )" here instead of backticks, since that
   # will break this!
   warn "` cat << "EOF"
@@ -37,3 +45,5 @@
 EOF
 `"
 fi
+
+echo done!


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.