diff --git a/system_setup/sync_client_software.sh b/system_setup/sync_client_software.sh index 84c5fdc..4fbdab1 100755 --- a/system_setup/sync_client_software.sh +++ b/system_setup/sync_client_software.sh @@ -73,15 +73,6 @@ else fi echo "" -# Repository must always be set to the right path (but maybe empty, which is fine) -if [ "${CLIENT_SOFTWARE_CUST_DST}" != "${SYSCONFIGPATH}/client_software_cust" ]; then - echo "Error in config: Required parameter CLIENT_SOFTWARE_CUST_DST is missing or set wrong." - echo "Please relog and if the problem reoccures, contact your system admins to correct the Values." - read -n 1 -s -r -p "Press any key to continue" - echo "" - exit 1 -fi - # Before running sync or software installs, restore the rights to all filles. # They must be owned by root, changeable by admingroup and readable by otherusers (we are root, so we can change!) # user_run.sh must also be executable by users @@ -91,8 +82,8 @@ chmod ug+rwX,o=rX -R ${SYSCONFIGPATH} #Make all install.sh executable find ${SYSCONFIGPATH}/client_software} -type f -name install.sh -exec chmod ug+x,o-x {} \; find ${SYSCONFIGPATH}/client_software} -type f -name user_run.sh -exec chmod ugo+x {} \; -find ${CLIENT_SOFTWARE_CUST_DST} -type f -name install.sh -exec chmod ug+x,o-x {} \; -find ${CLIENT_SOFTWARE_CUST_DST} -type f -name user_run.sh -exec chmod ugo+x {} \; +find ${SYSCONFIGPATH}/client_software_cust -type f -name install.sh -exec chmod ug+x,o-x {} \; +find ${SYSCONFIGPATH}/client_software_cust -type f -name user_run.sh -exec chmod ugo+x {} \; # At first, sync central configs if they are configured to be synced if [[ ! -z "${DISTCONFIGPATH_SRC}" ]]; then @@ -151,6 +142,15 @@ if [[ ! -z "${DISTCONFIGPATH_SRC}" ]]; then fi fi +# To run scripts, the tepository path must always be set right (but maybe empty, which is fine) +if [ "${CLIENT_SOFTWARE_CUST_DST}" != "${SYSCONFIGPATH}/client_software_cust" ]; then + echo "Error in config: Required parameter CLIENT_SOFTWARE_CUST_DST is missing or set wrong." + echo "Please relog and if the problem reoccures, contact your system admins to correct the Values." + read -n 1 -s -r -p "Press any key to continue" + echo "" + exit 1 +fi + echo "Running all software scripts in admin- context." # Run pre installed scripts in client_software echo "Running pre installed scripts first."