New customer software repository and small fixes #30

Merged
obel1x merged 15 commits from unbrot/fedora-OEMDRV:main into main 2026-05-08 17:11:23 +02:00
2 changed files with 11 additions and 11 deletions
Showing only changes of commit a250476b44 - Show all commits
+6 -6
View File
@@ -140,9 +140,9 @@ else
fi
#Anyway run user scripts if existent
elog_add "Running scripts in user- context."
elog_add "Running user setup scripts in user- context."
#1. Run the scripts, that are delivered by the package maintainers
elog_add "Pre installed scripts"
elog_add "Pre installed user setup scripts"
for DIR in $(ls -d ${SYSCONFIGPATH}/client_software/*/ | sort); # list directories in the form "/tmp/dirname/"
do
DIR=${DIR%*/} # remove the trailing "/"
@@ -165,7 +165,7 @@ do
elog_add " ===================="
fi
done
elog_add "Done running pre installed scripts"
elog_add "Done running pre installed user setup scripts"
#2. Run the scripts, that are delivered by the package maintainers
# To run scripts, the tepository path must always be set right (but maybe empty, which is fine)
@@ -174,7 +174,7 @@ if [ "${CLIENT_SOFTWARE_CUST_DST}" != "${SYSCONFIGPATH}/client_software_cust" ];
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"
else
elog_add "Running company delivered scripts in ${CLIENT_SOFTWARE_CUST_DST}"
elog_add "Running company delivered user setup scripts in ${CLIENT_SOFTWARE_CUST_DST}"
for DIR in $(ls -d ${CLIENT_SOFTWARE_CUST_DST}/*/ | sort); # list directories in the form "/tmp/dirname/"
do
DIR=${DIR%*/} # remove the trailing "/"
@@ -197,9 +197,9 @@ else
elog_add " ===================="
fi
done
elog_add "Done running company scripts"
elog_add "Done running company user setup scripts"
fi
elog_add "Completed user scripts."
elog_add "Completed user setup scripts."
elog_add ""
# Remove unused flatpak user installed software and data
+5 -5
View File
@@ -142,9 +142,9 @@ if [[ ! -z "${DISTCONFIGPATH_SRC}" ]]; then
fi
fi
echo "Running scripts in admin- context."
echo "Running install scripts in admin- context."
# Run pre installed scripts in client_software
echo "Running pre installed scripts in admin- context."
echo "Running pre installed install scripts in admin- context."
for DIR in $(ls -d ${SYSCONFIGPATH}/client_software/*/ | sort); do
DIR=${DIR%*/} # remove the trailing "/"
if [[ "$2." != "." ]] && [[ "${DIR}" != *"$2"* ]]; then
@@ -167,7 +167,7 @@ for DIR in $(ls -d ${SYSCONFIGPATH}/client_software/*/ | sort); do
echo " ===================="
fi
done
echo "Done running pre installed scripts in admin- context."
echo "Done running pre installed install scripts in admin- context."
echo
# To run scripts, the repository path must always be set right (but maybe empty, which is fine)
@@ -208,7 +208,7 @@ else
#Run customer setup
if [ ! -z "${CLIENT_SOFTWARE_CUST_DST}" ]; then
echo "Running all company scripts in user- context."
echo "Running company install scripts in user- context."
for DIR in $(ls -d ${CLIENT_SOFTWARE_CUST_DST}/*/ | sort); do
DIR=${DIR%*/} # remove the trailing "/"
if [[ "$1." != "." ]] && [[ "${DIR}" != *"$1"* ]]; then
@@ -231,7 +231,7 @@ else
echo " ===================="
fi
done
echo "Done running all company scripts in user- context."
echo "Done running company install scripts in user- context."
fi
fi