Bugfix Profilename in mozilla_starter to make execution with additional profile possible.

Smaller changes in Annotations
This commit is contained in:
Daniel Pätzold
2026-03-06 15:55:53 +01:00
parent cd0d655cad
commit 9e02483f04
5 changed files with 22 additions and 281 deletions
-273
View File
@@ -1,273 +0,0 @@
[Buildset]
BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x00"\x00f\x00e\x00d\x00o\x00r\x00a\x00-\x00O\x00E\x00M\x00D\x00R\x00V\x00.\x00g\x00i\x00t)
[Filters]
size=53
[Filters][0]
inclusive=0
pattern=.*
targets=3
[Filters][1]
inclusive=1
pattern=.gitignore
targets=1
[Filters][10]
inclusive=1
pattern=.codespellrc
targets=1
[Filters][11]
inclusive=1
pattern=.editorconfig
targets=1
[Filters][12]
inclusive=1
pattern=.isort.cfg
targets=1
[Filters][13]
inclusive=1
pattern=.mypy.ini
targets=1
[Filters][14]
inclusive=1
pattern=.pep8
targets=1
[Filters][15]
inclusive=1
pattern=.prettierignore
targets=1
[Filters][16]
inclusive=1
pattern=.prettierrc*
targets=1
[Filters][17]
inclusive=1
pattern=.pydocstyle*
targets=1
[Filters][18]
inclusive=1
pattern=.pylintrc
targets=1
[Filters][19]
inclusive=1
pattern=.readthedocs.y*ml
targets=1
[Filters][2]
inclusive=1
pattern=.gitmodules
targets=1
[Filters][20]
inclusive=1
pattern=.yamllint*
targets=1
[Filters][21]
inclusive=1
pattern=.flatpak-manifest.json
targets=1
[Filters][22]
inclusive=1
pattern=.circleci
targets=2
[Filters][23]
inclusive=0
pattern=.git
targets=2
[Filters][24]
inclusive=0
pattern=CVS
targets=2
[Filters][25]
inclusive=0
pattern=.svn
targets=2
[Filters][26]
inclusive=0
pattern=_svn
targets=2
[Filters][27]
inclusive=0
pattern=SCCS
targets=2
[Filters][28]
inclusive=0
pattern=_darcs
targets=2
[Filters][29]
inclusive=0
pattern=.hg
targets=2
[Filters][3]
inclusive=1
pattern=.pre-commit-config.yaml
targets=1
[Filters][30]
inclusive=0
pattern=.bzr
targets=2
[Filters][31]
inclusive=0
pattern=__pycache__
targets=2
[Filters][32]
inclusive=0
pattern=*.o
targets=1
[Filters][33]
inclusive=0
pattern=*.a
targets=1
[Filters][34]
inclusive=0
pattern=*.so
targets=1
[Filters][35]
inclusive=0
pattern=*.so.*
targets=1
[Filters][36]
inclusive=0
pattern=*.obj
targets=1
[Filters][37]
inclusive=0
pattern=*.lib
targets=1
[Filters][38]
inclusive=0
pattern=*.dll
targets=1
[Filters][39]
inclusive=0
pattern=*.exp
targets=1
[Filters][4]
inclusive=1
pattern=.gitlab-ci.yml
targets=1
[Filters][40]
inclusive=0
pattern=*.pdb
targets=1
[Filters][41]
inclusive=0
pattern=moc_*.cpp
targets=1
[Filters][42]
inclusive=0
pattern=*.moc
targets=1
[Filters][43]
inclusive=0
pattern=ui_*.h
targets=1
[Filters][44]
inclusive=0
pattern=*.qmlc
targets=1
[Filters][45]
inclusive=0
pattern=qrc_*.cpp
targets=1
[Filters][46]
inclusive=0
pattern=*~
targets=1
[Filters][47]
inclusive=0
pattern=*.orig
targets=1
[Filters][48]
inclusive=0
pattern=.*.kate-swp
targets=1
[Filters][49]
inclusive=0
pattern=.*.swp
targets=1
[Filters][5]
inclusive=1
pattern=.travis.yml
targets=1
[Filters][50]
inclusive=0
pattern=*.pyc
targets=1
[Filters][51]
inclusive=0
pattern=*.pyo
targets=1
[Filters][52]
inclusive=0
pattern=/system_setup/skel.tar.zst
targets=1
[Filters][6]
inclusive=1
pattern=.kde-ci.yml
targets=1
[Filters][7]
inclusive=1
pattern=.bumpversion.cfg
targets=1
[Filters][8]
inclusive=1
pattern=.clang-format
targets=1
[Filters][9]
inclusive=1
pattern=.clippy.toml
targets=1
[Project]
VersionControlSupport=kdevgit
+15 -1
View File
@@ -1,2 +1,16 @@
Fedora OEMDRV # Fedora OEMDRV
an automated massinstallation scripting collection for Anakonda an automated massinstallation scripting collection for Anakonda
IN DEVELOPMENT !
## Install
1. Create Partition named "OEMDRV", at least 1 GByte in size on a local disk that will be readable when starting installation from stick
2. Format it BTRFS and mount it to "/sys_config"
3. Copy git files in it
1. or for developement "/sys_config> git clone --progress -- https://gitea.dtext.online/obel1x/fedora-OEMDRV.git /sys_config"
Setup
- Check the settings in /sys_config/system_setup/setup_system.conf
+2 -1
View File
@@ -52,9 +52,10 @@ elog_add "Successfully obtained Token for User ${DAVTOKEN_USER}"
#SYNC Firefox + Thunderbird Profile #SYNC Firefox + Thunderbird Profile
./mozilla_starter.sh firefox sync && ./mozilla_starter.sh thunderbird sync ./mozilla_starter.sh firefox sync && ./mozilla_starter.sh thunderbird sync
elog_add "Successfully synced Mozilla profiles (log in another file)."
#Install additional Software #Install additional Software
elog_add "" elog_add "==="
elog_add "Update and install client Software" 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 # 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" # Hint: To get this working, create a new ipa rule with options "!authenticate" and "setenv"
+2 -2
View File
@@ -56,9 +56,9 @@ fi
echo "Synchronise profile" echo "Synchronise profile"
# optional: -s = silentmodus # 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***}" ) SYNCCMD_HIDDENPW=$( echo "${SYNCCMD/${DAVTOKEN_PASS}/***HIDDEN***}" )
echo "Exec: ${SYNCCMD_HIDDENPW}" echo "Exec ${1} with Profile ${profilename}: ${SYNCCMD_HIDDENPW}"
mkdir -p ${TEMPDIR} mkdir -p ${TEMPDIR}
echo "Mozilla Starter" > ${LOGFILE} echo "Mozilla Starter" > ${LOGFILE}
echo "===============" >> ${LOGFILE} echo "===============" >> ${LOGFILE}
+3 -4
View File
@@ -7,8 +7,6 @@
source ./setup_system.conf source ./setup_system.conf
source ./setup_system.inc.sh source ./setup_system.inc.sh
#Lokal Vars
#Check for root #Check for root
if [ "$EUID" -ne 0 ]; then if [ "$EUID" -ne 0 ]; then
echo "Error: Script requires root privileges. It should be executed via logon-script and not standalone." echo "Error: Script requires root privileges. It should be executed via logon-script and not standalone."
@@ -18,8 +16,8 @@ fi
#Check Token #Check Token
if [ "${DAVTOKEN_USER}." == "." ]; then if [ "${DAVTOKEN_USER}." == "." ]; then
echo "Error: Script cannot be executed standalone and needs a prereserved environement from logon-script." 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 "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 "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 exit 1
fi fi
@@ -61,6 +59,7 @@ if [[ $? -ne 0 ]]; then
echo "" echo ""
exit 1 exit 1
fi fi
#Files must be owned by root
chown root:root -R ${CLIENT_SOFTWARE_DST} chown root:root -R ${CLIENT_SOFTWARE_DST}
chmod u+rw,go-rwx -R ${CLIENT_SOFTWARE_DST} chmod u+rw,go-rwx -R ${CLIENT_SOFTWARE_DST}
if [ -f "${CLIENT_SOFTWARE_DST}/install.sh" ]; then if [ -f "${CLIENT_SOFTWARE_DST}/install.sh" ]; then