Skip to content

Commit

Permalink
Fixing how the environment is set for sh. Also removed service starts…
Browse files Browse the repository at this point in the history
… on debian because shouldn't be needed and not applicable to all packages
  • Loading branch information
arlake228 committed Apr 3, 2024
1 parent 2451690 commit 9ae5605
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions install-perfsonar
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ esac
INSTALL_ENV=""
case "${PS_BUNDLE}" in
core|toolkit|archive)
INSTALL_ENV="OPENSEARCH_INITIAL_ADMIN_PASSWORD=perfSONAR123!"
INSTALL_ENV="env OPENSEARCH_INITIAL_ADMIN_PASSWORD=perfSONAR123! "
;;
esac

Expand Down Expand Up @@ -280,7 +280,7 @@ install_redhat()

narrate "Installing perfSONAR ${PS_BUNDLE} bundle"

do_dry $INSTALL_ENV $DNF -y install "perfsonar-${PS_BUNDLE}"
do_dry ${INSTALL_ENV}$DNF -y install "perfsonar-${PS_BUNDLE}"

if $AUTO_UPDATES
then
Expand Down Expand Up @@ -386,12 +386,7 @@ install_debian()
do_dry apt -y update

narrate "Installing perfSONAR ${PS_BUNDLE} bundle"
do_dry $INSTALL_ENV apt -y install "perfsonar-${PS_BUNDLE}"

narrate "Starting services"
do_dry service owamp-server start
do_dry service perfsonar-lsregistrationdaemon start
do_dry pscheduler internal service restart
do_dry ${INSTALL_ENV}apt -y install "perfsonar-${PS_BUNDLE}"

if $AUTO_UPDATES
then
Expand Down

0 comments on commit 9ae5605

Please sign in to comment.