Skip to content
Browse files

removed relic variables from install script

added help message to list users indicating that -D is only ment for batch mode.

setup-tools 2.7 is now included in the tarball that is downloaded (not in git)
  • Loading branch information...
1 parent f6dfd04 commit e9c7ac04974a0e2cb30b0b0c4ee23f8eab549ef3 BuzzTroll committed
Showing with 4 additions and 17 deletions.
  1. +1 −1 home/libexec/nimbus_list_users.py
  2. +3 −16 libexec/install-real.sh
View
2 home/libexec/nimbus_list_users.py
@@ -58,7 +58,7 @@ def setup_options(argv):
opt = cbOpts("report", "r", "Report the selected columns from the following: " + pycb.tools.report_options_to_string(g_report_options), pycb.tools.report_options_to_string(g_report_options))
all_opts.append(opt)
- opt = cbOpts("delim", "D", "Character between columns in the report", ",")
+ opt = cbOpts("delim", "D", "Character between columns in the batch mode report. This options is only relevant when used with -b", ",")
all_opts.append(opt)
(o, args) = pynimbusauthz.parse_args(parser, all_opts, argv)
View
19 libexec/install-real.sh
@@ -48,31 +48,18 @@ if [ ! -f $CUMULUS_ENV ]; then
fi
source $CUMULUS_ENV
-REPOCMD2="$NIMBUS_HOME/ve/bin/cumulus-create-repo-admin $CUMULUS_REPO_BUCKET"
+REPOCMD="$NIMBUS_HOME/ve/bin/cumulus-create-repo-admin $CUMULUS_REPO_BUCKET"
-echo " $REPOCMD1"
-echo " $REPOCMD2"
-echo " $REPOCMD3"
+echo " $REPOCMD"
echo ""
-$REPOCMD1
-if [ $? -ne 0 ]; then
- echo "Could not start Cumulus."
- exit 1
-fi
-
-$REPOCMD2 >/dev/null
+$REPOCMD >/dev/null
if [ $? -ne 0 ]; then
echo "Could not create Cumulus repository."
exit 1
fi
echo "Created repo admin."
-$REPOCMD3
-if [ $? -ne 0 ]; then
- echo "Could not stop Cumulus? (continuing)"
-fi
-
echo ""
GUIDEURL=`$NIMBUS_HOME/bin/nimbus-version --guide`
if [ $? -ne 0 ]; then

0 comments on commit e9c7ac0

Please sign in to comment.
Something went wrong with that request. Please try again.