forked from obel1x/fedora-OEMDRV
Bugfix Profilename in mozilla_starter to make execution with additional profile possible.
Smaller changes in Annotations
This commit is contained in:
@@ -52,9 +52,10 @@ elog_add "Successfully obtained Token for User ${DAVTOKEN_USER}"
|
||||
|
||||
#SYNC Firefox + Thunderbird Profile
|
||||
./mozilla_starter.sh firefox sync && ./mozilla_starter.sh thunderbird sync
|
||||
elog_add "Successfully synced Mozilla profiles (log in another file)."
|
||||
|
||||
#Install additional Software
|
||||
elog_add ""
|
||||
elog_add "==="
|
||||
elog_add "Update and install client Software"
|
||||
# Without sudoers-rule for run without asking for password, it won't run and quit complaining about not askpass utilities found
|
||||
# Hint: To get this working, create a new ipa rule with options "!authenticate" and "setenv"
|
||||
|
||||
@@ -56,9 +56,9 @@ fi
|
||||
|
||||
echo "Synchronise profile"
|
||||
# optional: -s = silentmodus
|
||||
SYNCCMD="/usr/bin/flatpak run --branch=stable --arch=x86_64 --command=nextcloudcmd com.nextcloud.desktopclient.nextcloud -h -u ${DAVTOKEN_USER} -p ${DAVTOKEN_PASS} --path ${REMOTE_PATH} ${PROFILE_PATH} https://${SERVERFQDN_NC}"
|
||||
SYNCCMD="/usr/bin/flatpak run --branch=stable --arch=x86_64 --command=nextcloudcmd com.nextcloud.desktopclient.nextcloud -h -u ${DAVTOKEN_USER} -p ${DAVTOKEN_PASS} --path ${REMOTE_PATH}/${profilename} ${PROFILE_PATH}/${profilename} https://${SERVERFQDN_NC}"
|
||||
SYNCCMD_HIDDENPW=$( echo "${SYNCCMD/${DAVTOKEN_PASS}/***HIDDEN***}" )
|
||||
echo "Exec: ${SYNCCMD_HIDDENPW}"
|
||||
echo "Exec ${1} with Profile ${profilename}: ${SYNCCMD_HIDDENPW}"
|
||||
mkdir -p ${TEMPDIR}
|
||||
echo "Mozilla Starter" > ${LOGFILE}
|
||||
echo "===============" >> ${LOGFILE}
|
||||
|
||||
@@ -7,8 +7,6 @@
|
||||
source ./setup_system.conf
|
||||
source ./setup_system.inc.sh
|
||||
|
||||
#Lokal Vars
|
||||
|
||||
#Check for root
|
||||
if [ "$EUID" -ne 0 ]; then
|
||||
echo "Error: Script requires root privileges. It should be executed via logon-script and not standalone."
|
||||
@@ -18,8 +16,8 @@ fi
|
||||
#Check Token
|
||||
if [ "${DAVTOKEN_USER}." == "." ]; then
|
||||
echo "Error: Script cannot be executed standalone and needs a prereserved environement from logon-script."
|
||||
echo "To get executed without password prompt, use the NOPASSWD rule in sudo."
|
||||
echo "In FreeIPA you can use the sudo-option !authenticate in the sudo rule."
|
||||
echo "To get executed without password prompt, use the NOPASSWD rule in sudo. In FreeIPA you can use the sudo-option !authenticate in the sudo rule."
|
||||
echo "Additionally add the sudo command to the rule: ^\/sys_config\/system_setup\/sync_client_software\.sh.*$"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -61,6 +59,7 @@ if [[ $? -ne 0 ]]; then
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
#Files must be owned by root
|
||||
chown root:root -R ${CLIENT_SOFTWARE_DST}
|
||||
chmod u+rw,go-rwx -R ${CLIENT_SOFTWARE_DST}
|
||||
if [ -f "${CLIENT_SOFTWARE_DST}/install.sh" ]; then
|
||||
|
||||
Reference in New Issue
Block a user