diff --git a/serverhost/rename_camera_folder.sh b/serverhost/rename_camera_folder.sh index 8222970..4790f16 100755 --- a/serverhost/rename_camera_folder.sh +++ b/serverhost/rename_camera_folder.sh @@ -2,8 +2,9 @@ PW=$(cat /home/lucas/.PW) FOLDER=/torrent/camera SERVER="https://someoneslinux.ddns.net" -nextcloudcmd --trust --user lucas --password ${PW} --path Media/Pictures/Camera ${FOLDER} ${SERVER} 1>/dev/null 2>&1 + export PYTHONPATH=/home/lucas/scripts +syncNC -c /home/lucas/.venv_general/bin/python3 /home/lucas/scripts/serverhost/rename_camera_folder.py ${FOLDER} -nextcloudcmd --trust --user lucas --password ${PW} --path Media/Pictures/Camera ${FOLDER} ${SERVER} 1>/dev/null 2>&1 +syncNC -c diff --git a/serverhost/syncNC.sh b/serverhost/syncNC.sh index 5e81e73..ada5452 100755 --- a/serverhost/syncNC.sh +++ b/serverhost/syncNC.sh @@ -11,6 +11,9 @@ ret=0 count=20 PW=$(cat /home/lucas/.PW) PW_M="multimedia123" +flatpack1="" +flatpack2="" +debug="" SYNC_MEDIA=1 SYNC_RECIPIES=1 SYNC_ALINA=1 @@ -28,6 +31,12 @@ while [[ ${1:0:1} == - ]]; do shift 1; continue; }; + [[ $1 == -f ]] && { + flatpack2="com.nextcloud.desktopclient.nextcloud " + flatpack1="flatpak run --command=" + shift 1; + continue; + }; [[ $1 == -o ]] && { SYNC_SERVER=1; SYNC_WALLPAPER=1 @@ -79,49 +88,50 @@ else ret=0 if [ ${SYNC_MEDIA} -eq 0 ];then echo "Sync Multmedia" - run_cmd sudo /home/lucas/scripts/serverhost/tvbitch_user_cmd.sh nextcloudcmd --logdebug --trust --user multimedia --password ${PW_M} --path Filme/New /torrent/multimedia/Filme/New ${SERVER} + run_cmd sudo /home/lucas/scripts/serverhost/tvbitch_user_cmd.sh ${flatpack1}nextcloudcmd ${debug} --trust --user multimedia --password ${PW_M} --path Filme/New /torrent/multimedia/Filme/New ${flatpack2}${SERVER} + echo run_cmd sudo /home/lucas/scripts/serverhost/tvbitch_user_cmd.sh ${flatpack1}nextcloudcmd ${debug} --trust --user multimedia --password ${PW_M} --path Filme/New /torrent/multimedia/Filme/New ${flatpack2}${SERVER} ret=$(( ret + $? )) #echo Return: $ret fi if [[ ${SYNC_THEMES} -eq 0 ]] && [[ ${SYNC_MEDIA_ONLY} -eq 0 ]]; then echo "Sync Themes" - run_cmd nextcloudcmd --trust --user lucas --password ${PW} --path Dokumente/Dokumente/Projekte/Handy/ThemeProject/SolarSystemTheme /home/lucas/Documents/Dokumente/Projekte/Handy/ThemeProject/SolarSystemTheme ${SERVER} + run_cmd ${flatpack1}nextcloudcmd --trust --user lucas --password ${PW} --path Dokumente/Dokumente/Projekte/Handy/ThemeProject/SolarSystemTheme /home/lucas/Documents/Dokumente/Projekte/Handy/ThemeProject/SolarSystemTheme ${flatpack2}${SERVER} ret=$(( ret + $? )) #echo Return: $ret fi if [[ ${SYNC_ALINA_DROP} -eq 0 ]];then echo "Sync Alina Share" - run_cmd nextcloudcmd --trust --user lucas --password ${PW} --path Media/Pictures/Alina\ Share/ /torrent/alina ${SERVER} + run_cmd ${flatpack1}nextcloudcmd --trust --user lucas --password ${PW} --path Media/Pictures/Alina\ Share/ /torrent/alina ${flatpack2}${SERVER} ret=$(( ret + $? )) #echo Return: $ret fi if [[ ${SYNC_ALINA} -eq 0 ]];then echo "Sync Alina" - run_cmd nextcloudcmd --trust --user lucas --password ${PW} --path Dokumente/Dokumente/Shared/Alina/Wachstum /home/lucas/Documents/Dokumente/Shared/Alina/Wachstum ${SERVER} + run_cmd ${flatpack1}nextcloudcmd --trust --user lucas --password ${PW} --path Dokumente/Dokumente/Shared/Alina/Wachstum /home/lucas/Documents/Dokumente/Shared/Alina/Wachstum ${flatpack2}${SERVER} ret=$(( ret + $? )) #echo Return: $ret fi if [[ ${SYNC_RECIPIES} -eq 0 ]];then echo "Sync Recipies" - run_cmd nextcloudcmd --trust --user lucas --password ${PW} --path Dokumente/Dokumente/Shared/Diverses/Kochbuch/RecepiesLucas /home/lucas/Documents/Dokumente/Shared/Diverses/Kochbuch/RecepiesLucas ${SERVER} + run_cmd ${flatpack1}nextcloudcmd --trust --user lucas --password ${PW} --path Dokumente/Dokumente/Shared/Diverses/Kochbuch/RecepiesLucas /home/lucas/Documents/Dokumente/Shared/Diverses/Kochbuch/RecepiesLucas ${flatpack2}${SERVER} ret=$(( ret + $? )) #echo Return: $ret fi if [[ ${SYNC_CAMERA} -eq 0 ]];then echo "Sync Camera" - nextcloudcmd --trust --user lucas --password ${PW} --path Media/Pictures/Camera /torrent/camera ${SERVER} 1>/dev/null 2>&1 + ${flatpack1}nextcloudcmd --trust --user lucas --password ${PW} --path Media/Pictures/Camera /torrent/camera ${flatpack2}${SERVER} 1>/dev/null 2>&1 ret=$(( ret + $? )) #echo Return: $ret fi if [[ ${SYNC_SERVER} -eq 0 ]];then echo "Sync Server" - run_cmd nextcloudcmd --trust --user lucas --password ${PW} --path Dokumente/Dokumente/Projekte/Server /home/lucas/Documents/Dokumente/Projekte/Server ${SERVER} + run_cmd ${flatpack1}nextcloudcmd --trust --user lucas --password ${PW} --path Dokumente/Dokumente/Projekte/Server /home/lucas/Documents/Dokumente/Projekte/Server ${flatpack2}${SERVER} ret=$(( ret + $? )) #echo Return: $ret fi if [[ ${SYNC_WALLPAPER} -eq 0 ]]; then echo "Sync Wallpaper" - run_cmd nextcloudcmd --trust --user lucas --password ${PW} --path Media/Stuff/Wallpaper /torrent/WallpaperChanger ${SERVER} + run_cmd ${flatpack1}nextcloudcmd --trust --user lucas --password ${PW} --path Media/Stuff/Wallpaper /torrent/WallpaperChanger ${flatpack2}${SERVER} ret=$(( ret + $? )) #echo Return: $ret fi