diff options
102 files changed, 119 insertions, 119 deletions
diff --git a/addons/0-byte-files.sh b/addons/0-byte-files.sh index 8554bcc8..ac13bac2 100644 --- a/addons/0-byte-files.sh +++ b/addons/0-byte-files.sh @@ -4,7 +4,7 @@ true SCRIPT_NAME="Check for 0-Byte files" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh filesystems[0]="$NCDATA" cd "$NCDATA" diff --git a/addons/automatic_updates.sh b/addons/automatic_updates.sh index b1278c19..161a812b 100644 --- a/addons/automatic_updates.sh +++ b/addons/automatic_updates.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Automatic Updates" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh SCRIPT_EXPLAINER="This option will update your server every week on Saturdays at $AUT_UPDATES_TIME:00. The update will run the built in script '$SCRIPTS/update.sh' which will update both the server packages and Nextcloud itself.\n You can read more about it here: https://www.techandme.se/nextcloud-update-is-now-fully-automated/ diff --git a/addons/cookielifetime.sh b/addons/cookielifetime.sh index 637c31c5..4e73de4e 100644 --- a/addons/cookielifetime.sh +++ b/addons/cookielifetime.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Set Cookie Lifetime" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh print_text_in_color "$ICyan" "Configuring Cookie Lifetime timeout..." diff --git a/addons/database_shrinking.sh b/addons/database_shrinking.sh index 0493e5e8..a5ce355e 100644 --- a/addons/database_shrinking.sh +++ b/addons/database_shrinking.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Database Shrinking" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh SCRIPT_EXPLAINER="This script allows to shrink your database if it has grown too much due to the usage of external storage. If you don't use external storage, you should NOT run this script!" diff --git a/addons/deSEC/desec.sh b/addons/deSEC/desec.sh index d10a6389..a79dfcd5 100644 --- a/addons/deSEC/desec.sh +++ b/addons/deSEC/desec.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="deSEC Registration" SCRIPT_EXPLAINER="This script will automatically register a domain of your liking, secure it with TLS, and set it to automatically update your external IP address with DDNS." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh prompt_dedyn_subdomain(){ diff --git a/addons/deSEC/desec_subdomain.sh b/addons/deSEC/desec_subdomain.sh index f542b76e..cc76f610 100644 --- a/addons/deSEC/desec_subdomain.sh +++ b/addons/deSEC/desec_subdomain.sh @@ -8,7 +8,7 @@ SCRIPT_EXPLAINER="This script enables you to add a subdomain to your existing de You can also remove existing subdomains (RRsets) with this script. If you want to remove, please choose 'Uninstall' in the next menu." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/addons/deSEC/remove_desec.sh b/addons/deSEC/remove_desec.sh index e96393df..1411a4ab 100644 --- a/addons/deSEC/remove_desec.sh +++ b/addons/deSEC/remove_desec.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="deSEC Removal" SCRIPT_EXPLAINER="This script lets you remove your deSEC account.\n\nMaybe you want to re-add it again with another domain? In that case this is what you need to run first, since the install script only can handle one email address at the time." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/addons/fix_invalid_modification_time.sh b/addons/fix_invalid_modification_time.sh index 2ac4bebc..544ba99e 100644 --- a/addons/fix_invalid_modification_time.sh +++ b/addons/fix_invalid_modification_time.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Fix 'Could not update metadata due to invalid modified time'." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check if root root_check diff --git a/addons/harden-ssh.sh b/addons/harden-ssh.sh index 8171e45e..d2ccb316 100644 --- a/addons/harden-ssh.sh +++ b/addons/harden-ssh.sh @@ -7,7 +7,7 @@ true SCRIPT_NAME="SSH Hardening" SCRIPT_EXPLAINER="This script hardens the SSH settings based on Lynis security check." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/addons/locales.sh b/addons/locales.sh index 106e24a3..ce591b44 100644 --- a/addons/locales.sh +++ b/addons/locales.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Locales" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/addons/locate_mirror.sh b/addons/locate_mirror.sh index a869ddce..f54148ca 100644 --- a/addons/locate_mirror.sh +++ b/addons/locate_mirror.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Locate Mirror" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Must be root root_check diff --git a/addons/redis-server-ubuntu.sh b/addons/redis-server-ubuntu.sh index 9328a9a6..b1a794d1 100644 --- a/addons/redis-server-ubuntu.sh +++ b/addons/redis-server-ubuntu.sh @@ -2,7 +2,7 @@ true SCRIPT_NAME="Redis Server Ubuntu" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # T&M Hansson IT AB © - 2022, https://www.hanssonit.se/ diff --git a/addons/security.sh b/addons/security.sh index 1c368c89..263a6e92 100644 --- a/addons/security.sh +++ b/addons/security.sh @@ -13,7 +13,7 @@ As it's kind of intrusive, it could lead to things stop working. But on the othe Please run it own your own risk!" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/addons/smtp-mail.sh b/addons/smtp-mail.sh index ac1ea57f..68d09b7d 100644 --- a/addons/smtp-mail.sh +++ b/addons/smtp-mail.sh @@ -8,7 +8,7 @@ SCRIPT_NAME="SMTP Relay with msmtp" SCRIPT_EXPLAINER="This script will setup an SMTP Relay (Mail Server) in your Nextcloud Server \ that will be used to send emails about failed cronjob's and such." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/apps/adminer.sh b/apps/adminer.sh index da441136..04ab4713 100644 --- a/apps/adminer.sh +++ b/apps/adminer.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Adminer" SCRIPT_EXPLAINER="Adminer is a full-featured database management tool written in PHP." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/apps/bitwarden_mailconfig.sh b/apps/bitwarden_mailconfig.sh index 05859a3e..487a01f0 100644 --- a/apps/bitwarden_mailconfig.sh +++ b/apps/bitwarden_mailconfig.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Bitwarden Mail Configuration" SCRIPT_EXPLAINER="This script lets you configure your mailserver settings for Bitwarden." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/apps/bitwarden_registration.sh b/apps/bitwarden_registration.sh index 921b314e..5a539ace 100644 --- a/apps/bitwarden_registration.sh +++ b/apps/bitwarden_registration.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Bitwarden Registration" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/apps/bpytop.sh b/apps/bpytop.sh index 7531e844..7bfacd72 100644 --- a/apps/bpytop.sh +++ b/apps/bpytop.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="BPYTOP" SCRIPT_EXPLAINER="BPYTOP is an amazing alternative to resource-monitor software like top or htop." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/apps/clamav.sh b/apps/clamav.sh index da7c172e..0a14ed80 100644 --- a/apps/clamav.sh +++ b/apps/clamav.sh @@ -8,7 +8,7 @@ SCRIPT_EXPLAINER="This script installs the open-source antivirus-software ClamAV and configures Nextcloud to detect infected files already during the upload. At the end of the script, you will be able to choose to set up a weekly full scan of all files." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON @@ -199,7 +199,7 @@ cat << CLAMAV_REPORT > "$SCRIPTS"/clamav-fullscan.sh # T&M Hansson IT AB © - 2022, https://www.hanssonit.se/ -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Variables/arrays FULLSCAN_DONE="" diff --git a/apps/collabora_docker.sh b/apps/collabora_docker.sh index 6bef4347..abb673b7 100644 --- a/apps/collabora_docker.sh +++ b/apps/collabora_docker.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Collabora (Docker)" SCRIPT_EXPLAINER="This script will install the Collabora Office Server bundled with Docker" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON @@ -56,7 +56,7 @@ NCDOMAIN=$(nextcloud_occ_no_check config:system:get overwrite.cli.url | sed 's|h # Curl the library another time to get the correct https_conf # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Get all needed variables from the library nc_update diff --git a/apps/collabora_integrated.sh b/apps/collabora_integrated.sh index 07b87e18..cba2bccc 100644 --- a/apps/collabora_integrated.sh +++ b/apps/collabora_integrated.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Collabora (Integrated)" SCRIPT_EXPLAINER="This script will install the integrated Collabora Office Server" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Get all needed variables from the library nc_update diff --git a/apps/extract.sh b/apps/extract.sh index e72e67f1..0031d8e2 100644 --- a/apps/extract.sh +++ b/apps/extract.sh @@ -7,7 +7,7 @@ true SCRIPT_NAME="Extract for Nextcloud" SCRIPT_EXPLAINER="$SCRIPT_NAME enables archive extraction inside your Nextcloud." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/apps/face-recognition.sh b/apps/face-recognition.sh index 07ccee42..02466032 100644 --- a/apps/face-recognition.sh +++ b/apps/face-recognition.sh @@ -7,7 +7,7 @@ true SCRIPT_NAME="Face Recognition" SCRIPT_EXPLAINER="The $SCRIPT_NAME app allows to automatically scan for faces inside your Nextcloud." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/apps/fail2ban.sh b/apps/fail2ban.sh index 93a74dfb..1ba6aa4e 100644 --- a/apps/fail2ban.sh +++ b/apps/fail2ban.sh @@ -11,7 +11,7 @@ signs -- too many password failures, seeking for exploits, etc. Generally Fail2Ban is then used to update firewall rules to \ reject the IP addresses for a specified amount of time." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Get all needed variables from the library nc_update @@ -226,7 +226,7 @@ then fi # Report if something was found -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh if ! send_mail "Your daily Fail2Ban report" "These IP's got banned today: \$BANNED_IPS" then diff --git a/apps/fulltextsearch.sh b/apps/fulltextsearch.sh index e914256b..fed05454 100644 --- a/apps/fulltextsearch.sh +++ b/apps/fulltextsearch.sh @@ -7,7 +7,7 @@ true SCRIPT_NAME="Full Text Search" SCRIPT_EXPLAINER="Full Text Search provides OpenSearch for Nextcloud, which makes it possible to search for text inside files." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Get all needed variables from the library ncdb diff --git a/apps/midnight-commander.sh b/apps/midnight-commander.sh index 6f56ef5d..c32335f9 100644 --- a/apps/midnight-commander.sh +++ b/apps/midnight-commander.sh @@ -10,7 +10,7 @@ that provides a flexible, powerful, and convenient set of file and directory ope It is capable of running in either a console or an xterm under X11. Its basic operation is easily mastered by the novice while providing a rich feature set and extensive customization." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/apps/netdata.sh b/apps/netdata.sh index b7a3e9ba..8f5f5ec1 100644 --- a/apps/netdata.sh +++ b/apps/netdata.sh @@ -11,7 +11,7 @@ The tool is designed to visualize activity in the greatest possible detail, \ allowing the user to obtain an overview of what is happening \ and what has just happened in their system or application." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/apps/notify_push.sh b/apps/notify_push.sh index 14335ceb..4b03c315 100644 --- a/apps/notify_push.sh +++ b/apps/notify_push.sh @@ -12,7 +12,7 @@ By providing a way for the server to send update notifications to the clients, \ the need for the clients to make these checks can be greatly reduced, \ which reduces the load on the servern and delivers notifications to the clients in some cases faster." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/apps/onlyoffice_docker.sh b/apps/onlyoffice_docker.sh index d8930948..2a13ba55 100644 --- a/apps/onlyoffice_docker.sh +++ b/apps/onlyoffice_docker.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="OnlyOffice (Docker)" SCRIPT_EXPLAINER="This script will install the OnlyOffice Document Server bundled with Docker" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON @@ -69,7 +69,7 @@ NCDOMAIN=$(nextcloud_occ_no_check config:system:get overwrite.cli.url | sed 's|h true # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Get all needed variables from the library nc_update diff --git a/apps/onlyoffice_integrated.sh b/apps/onlyoffice_integrated.sh index 63584594..140716ac 100644 --- a/apps/onlyoffice_integrated.sh +++ b/apps/onlyoffice_integrated.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="OnlyOffice (Integrated)" SCRIPT_EXPLAINER="This script will install the integrated OnlyOffice Documentserver Community." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Get all needed variables from the library nc_update diff --git a/apps/pdfannotate.sh b/apps/pdfannotate.sh index 520f971d..b88701b9 100644 --- a/apps/pdfannotate.sh +++ b/apps/pdfannotate.sh @@ -8,7 +8,7 @@ SCRIPT_NAME="PDF Annotations" SCRIPT_EXPLAINER="This script allows to easily install PDF Annotations, \ a tool to annotate any PDF document inside Nextcloud." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/apps/pico_cms.sh b/apps/pico_cms.sh index 478f48f8..9a806b47 100644 --- a/apps/pico_cms.sh +++ b/apps/pico_cms.sh @@ -7,7 +7,7 @@ true SCRIPT_NAME="Pico CMS" SCRIPT_EXPLAINER="This script allows to easily install Pico CMS, a leightweight CMS integration in Nextcloud." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON @@ -158,7 +158,7 @@ They can however be hosted on the same server, but would require separate DNS en true # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Get all needed variables from the library nc_update diff --git a/apps/previewgenerator.sh b/apps/previewgenerator.sh index dc79032c..9dcd0b7a 100644 --- a/apps/previewgenerator.sh +++ b/apps/previewgenerator.sh @@ -7,7 +7,7 @@ SCRIPT_NAME="Preview Generator" SCRIPT_EXPLAINER="This script will install the Preview Generator. It can speedup the loading of previews in Nextcloud a lot." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/apps/smbmount.sh b/apps/smbmount.sh index 4e50889a..81fdcf20 100644 --- a/apps/smbmount.sh +++ b/apps/smbmount.sh @@ -8,7 +8,7 @@ SCRIPT_NAME="SMB Mount" SCRIPT_EXPLAINER="This script automates mounting SMB-shares locally in your \ system and adds them automatically as external storage to your Nextcloud." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/apps/talk.sh b/apps/talk.sh index a1185982..8f185abf 100644 --- a/apps/talk.sh +++ b/apps/talk.sh @@ -8,7 +8,7 @@ SCRIPT_EXPLAINER="This script installs Nextcloud Talk and also offers the possib to install the so-called High-Performance-Backend, which makes it possible to host more video calls than it would be with the standard Talk app. \ It's called 'Talk Signaling' and you will be offered to install it as part two of this script." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Get all needed variables from the library nc_update @@ -207,7 +207,7 @@ They can however be hosted on the same server, but would require separate DNS en # curl the lib another time to get the correct https_conf # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Notification msg_box "Before continuing, please make sure that you have you have \ diff --git a/apps/tmbitwarden.sh b/apps/tmbitwarden.sh index 29328ce7..edd57c35 100644 --- a/apps/tmbitwarden.sh +++ b/apps/tmbitwarden.sh @@ -10,7 +10,7 @@ The Bitwarden platform offers a variety of client applications including a \ web interface, desktop applications, browser extensions, mobile apps, and a CLI. Bitwarden offers a cloud-hosted service as well as the ability to deploy the solution on-premises." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON @@ -220,7 +220,7 @@ fi # Curl the lib another time to get the correct HTTPS_CONF # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check if $SUBDOMAIN exists and is reachable print_text_in_color "$ICyan" "Checking if $SUBDOMAIN exists and is reachable..." diff --git a/apps/vaultwarden.sh b/apps/vaultwarden.sh index adb5c827..ddfe4c07 100644 --- a/apps/vaultwarden.sh +++ b/apps/vaultwarden.sh @@ -7,7 +7,7 @@ SCRIPT_NAME="Vaultwarden (formerly Bitwarden RS)" SCRIPT_EXPLAINER="Vaultwarden, formerly known as Bitwarden RS, is an unofficial Bitwarden server API implementation in Rust. It has less hardware requirements and therefore runs on nearly any hardware." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON @@ -78,7 +78,7 @@ SUBDOMAIN=$(input_box_flow "Please enter the Domain that you want to use for Vau # curl the lib another time to get the correct https_conf # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Inform the user msg_box "Before continuing, please make sure that you have \ diff --git a/apps/vaultwarden_admin-panel.sh b/apps/vaultwarden_admin-panel.sh index ecb865a1..09cc3c37 100644 --- a/apps/vaultwarden_admin-panel.sh +++ b/apps/vaultwarden_admin-panel.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Vaultwarden (formerly Bitwarden RS) Admin Panel" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/apps/webmin.sh b/apps/webmin.sh index 8e835108..5dfb087d 100644 --- a/apps/webmin.sh +++ b/apps/webmin.sh @@ -11,7 +11,7 @@ and lets you manage a system from the console or remotely. See the following page with standard modules for a list of all the functions built into Webmin: \ https://webmin.com/standard.html" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/apps/whiteboard.sh b/apps/whiteboard.sh index 191a5800..8dd910ac 100644 --- a/apps/whiteboard.sh +++ b/apps/whiteboard.sh @@ -10,7 +10,7 @@ It integrates Spacedeck whiteboard server and lets Nextcloud users create .white can then be opened in the Files app and in Talk. Those files can be shared to other users or via \ public links. Everyone having access with write permissions to such a file can edit it collaboratively." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/disk/change-to-zfs-mount-generator.sh b/disk/change-to-zfs-mount-generator.sh index 2d5336b6..27765035 100644 --- a/disk/change-to-zfs-mount-generator.sh +++ b/disk/change-to-zfs-mount-generator.sh @@ -13,7 +13,7 @@ true SCRIPT_NAME="Change to ZFS Mount Generator" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check if root root_check diff --git a/disk/create-daily-zfs-prune.sh b/disk/create-daily-zfs-prune.sh index 914d2b99..f7cbd28b 100644 --- a/disk/create-daily-zfs-prune.sh +++ b/disk/create-daily-zfs-prune.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Create daily ZFS prune script" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check if root root_check diff --git a/disk/format-chosen.sh b/disk/format-chosen.sh index 8233fe70..c7900cf8 100644 --- a/disk/format-chosen.sh +++ b/disk/format-chosen.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Format Chosen Disk" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check if root root_check diff --git a/disk/format-sdb.sh b/disk/format-sdb.sh index 148b8288..3e826e53 100644 --- a/disk/format-sdb.sh +++ b/disk/format-sdb.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Format sdb" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check if root root_check diff --git a/disk/prune_zfs_snaphots.sh b/disk/prune_zfs_snaphots.sh index aab1894e..df955246 100644 --- a/disk/prune_zfs_snaphots.sh +++ b/disk/prune_zfs_snaphots.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Prune ZFS Snapshots" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/disk/smart-monitoring.sh b/disk/smart-monitoring.sh index 4a34ba63..e3b183ae 100644 --- a/disk/smart-monitoring.sh +++ b/disk/smart-monitoring.sh @@ -8,7 +8,7 @@ SCRIPT_NAME="S.M.A.R.T Monitoring" SCRIPT_EXPLAINER="This script configures S.M.A.R.T Monitoring for all your drives \ and sends a notification if an error was found." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON @@ -122,7 +122,7 @@ SCRIPT_NAME="S.M.A.R.T Notification" SCRIPT_EXPLAINER="This script sends a notification if something is wrong with your drives." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check if root root_check @@ -169,7 +169,7 @@ SCRIPT_NAME="S.M.A.R.T Notification" SCRIPT_EXPLAINER="This script sends a notification if something is wrong with your drives." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check if root root_check diff --git a/lets-encrypt/activate-tls.sh b/lets-encrypt/activate-tls.sh index 32c72091..f5c128fb 100644 --- a/lets-encrypt/activate-tls.sh +++ b/lets-encrypt/activate-tls.sh @@ -2,7 +2,7 @@ true SCRIPT_NAME="Activate TLS" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # T&M Hansson IT AB © - 2022, https://www.hanssonit.se/ @@ -78,7 +78,7 @@ fi # Curl the lib another time to get the correct https_conf # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check if $TLSDOMAIN exists and is reachable echo diff --git a/lets-encrypt/test-new-config.sh b/lets-encrypt/test-new-config.sh index c198ac52..eaf49244 100644 --- a/lets-encrypt/test-new-config.sh +++ b/lets-encrypt/test-new-config.sh @@ -2,7 +2,7 @@ true SCRIPT_NAME="Test New Configuration" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # T&M Hansson IT AB © - 2022, https://www.hanssonit.se/ @@ -55,7 +55,7 @@ then if ! pgrep apache2 > /dev/null then # shellcheck source=lib.sh - source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) + source /var/scripts/fetch_lib.sh notify_admin_gui "Could not start Apache!" "Please report this to $ISSUES!" fi fi diff --git a/menu/additional_apps.sh b/menu/additional_apps.sh index 0f677411..58034b46 100644 --- a/menu/additional_apps.sh +++ b/menu/additional_apps.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Additional Apps Menu" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/menu/bitwarden_menu.sh b/menu/bitwarden_menu.sh index f0ba9784..b021c0ab 100644 --- a/menu/bitwarden_menu.sh +++ b/menu/bitwarden_menu.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Bitwarden Menu" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/menu/desec_menu.sh b/menu/desec_menu.sh index d72e375d..90d7e2ef 100644 --- a/menu/desec_menu.sh +++ b/menu/desec_menu.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="deSEC Menu" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/menu/documentserver.sh b/menu/documentserver.sh index 3cbf2a82..0c848d57 100644 --- a/menu/documentserver.sh +++ b/menu/documentserver.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Documentserver Menu" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/menu/fail2ban_menu.sh b/menu/fail2ban_menu.sh index 79210b30..bb869a49 100644 --- a/menu/fail2ban_menu.sh +++ b/menu/fail2ban_menu.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Fail2ban Menu" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/menu/main_menu.sh b/menu/main_menu.sh index 210aec17..e8b3a09e 100644 --- a/menu/main_menu.sh +++ b/menu/main_menu.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Main Menu" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Needed for Update option nc_update diff --git a/menu/menu.sh b/menu/menu.sh index 3e344386..af8c7130 100644 --- a/menu/menu.sh +++ b/menu/menu.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Main Menu" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/menu/nextcloud_configuration.sh b/menu/nextcloud_configuration.sh index e18946b3..817d0c16 100644 --- a/menu/nextcloud_configuration.sh +++ b/menu/nextcloud_configuration.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Nextcloud Configuration Menu" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Get all needed variables from the library nc_update diff --git a/menu/server_configuration.sh b/menu/server_configuration.sh index 724a47b3..9c585c8e 100644 --- a/menu/server_configuration.sh +++ b/menu/server_configuration.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Server Configuration Menu" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/menu/startup_configuration.sh b/menu/startup_configuration.sh index 7cbc6ce2..c83e01df 100644 --- a/menu/startup_configuration.sh +++ b/menu/startup_configuration.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Startup Configuration Menu" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/network/asusnuc/pn51.sh b/network/asusnuc/pn51.sh index 1ce528eb..ab3d0acf 100644 --- a/network/asusnuc/pn51.sh +++ b/network/asusnuc/pn51.sh @@ -11,7 +11,7 @@ true SCRIPT_NAME="PN51 Network Drivers" SCRIPT_EXPLAINER="This installs the correct drivers for the 2.5GB LAN card in the PN51 ASUS" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/network/ddclient-configuration.sh b/network/ddclient-configuration.sh index 750eb669..4308eb17 100644 --- a/network/ddclient-configuration.sh +++ b/network/ddclient-configuration.sh @@ -7,7 +7,7 @@ true SCRIPT_NAME="DynDNS with ddclient" SCRIPT_EXPLAINER="This script lets you set up DynDNS by using the Linux ddclient software." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/network/geoblock.sh b/network/geoblock.sh index 2939ebdd..e586ad73 100644 --- a/network/geoblock.sh +++ b/network/geoblock.sh @@ -10,7 +10,7 @@ Attention! Geoblock can break the certificate renewal via \"Let's encrypt!\" if done too strict! If you have problems with \"Let's encrypt!\", please uninstall geoblock first to see if that fixes those issues!" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/network/static_ip.sh b/network/static_ip.sh index 4cbf8d8d..302c7a0c 100644 --- a/network/static_ip.sh +++ b/network/static_ip.sh @@ -8,7 +8,7 @@ then true SCRIPT_NAME="Static IP" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # If we have internet, then use the latest variables from the lib remote file elif [ -f /var/scripts/lib.sh ] then diff --git a/network/trusted.sh b/network/trusted.sh index 803a97d6..733e02eb 100644 --- a/network/trusted.sh +++ b/network/trusted.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Trusted" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/not-supported/backup-viewer.sh b/not-supported/backup-viewer.sh index 2d316624..a1e04b00 100644 --- a/not-supported/backup-viewer.sh +++ b/not-supported/backup-viewer.sh @@ -7,7 +7,7 @@ true SCRIPT_NAME="Backup Viewer" SCRIPT_EXPLAINER="This script shows the content of daily and/or off-shore backups." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/not-supported/bitlocker-mount.sh b/not-supported/bitlocker-mount.sh index 2dc2911d..6e7a6be0 100644 --- a/not-supported/bitlocker-mount.sh +++ b/not-supported/bitlocker-mount.sh @@ -9,7 +9,7 @@ SCRIPT_EXPLAINER="This script automates mounting Bitlocker encrypted drives loca Currently supported are only Bitlocker encrypted NTFS (Windows) drives. You need a password to mount the drive. Recovery keys are not supported." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/not-supported/borgbackup.sh b/not-supported/borgbackup.sh index b63a9445..ae1d6043 100644 --- a/not-supported/borgbackup.sh +++ b/not-supported/borgbackup.sh @@ -8,7 +8,7 @@ true SCRIPT_NAME="Borg Backup" SCRIPT_EXPLAINER="This script creates the Borg backup of your server." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/not-supported/btrfs-format.sh b/not-supported/btrfs-format.sh index 58226b66..fbbb979a 100644 --- a/not-supported/btrfs-format.sh +++ b/not-supported/btrfs-format.sh @@ -7,7 +7,7 @@ true SCRIPT_NAME="BTRFS Mount" SCRIPT_EXPLAINER="This script automates formatting drives to BTRFS." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/not-supported/btrfs-mount.sh b/not-supported/btrfs-mount.sh index 6b161286..cdeaca21 100644 --- a/not-supported/btrfs-mount.sh +++ b/not-supported/btrfs-mount.sh @@ -7,7 +7,7 @@ true SCRIPT_NAME="BTRFS Mount" SCRIPT_EXPLAINER="This script automates mounting BTRFS drives locally in your system." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON @@ -254,7 +254,7 @@ chown root:root "$SCRIPTS/scrub-btrfs-monthly.sh" chmod 700 "$SCRIPTS/scrub-btrfs-monthly.sh" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh SNAPSHOT fi cat << SNAPSHOT >> "$SCRIPTS/scrub-btrfs-monthly.sh" diff --git a/not-supported/daily-backup-wizard.sh b/not-supported/daily-backup-wizard.sh index 94575868..0a4fc39d 100644 --- a/not-supported/daily-backup-wizard.sh +++ b/not-supported/daily-backup-wizard.sh @@ -7,7 +7,7 @@ true SCRIPT_NAME="Daily Backup Wizard" SCRIPT_EXPLAINER="This script helps creating a daily backup script for your server." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON @@ -422,7 +422,7 @@ true SCRIPT_NAME="Daily Borg Backup" SCRIPT_EXPLAINER="This script executes the daily Borg backup." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/not-supported/firewall.sh b/not-supported/firewall.sh index c039bbd0..dd31437f 100644 --- a/not-supported/firewall.sh +++ b/not-supported/firewall.sh @@ -7,7 +7,7 @@ true SCRIPT_NAME="Firewall" SCRIPT_EXPLAINER="This script helps setting up a firewall for your NcVM." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/not-supported/monitor-link-shares.sh b/not-supported/monitor-link-shares.sh index d0c2470d..3e836f60 100644 --- a/not-supported/monitor-link-shares.sh +++ b/not-supported/monitor-link-shares.sh @@ -6,7 +6,7 @@ true SCRIPT_NAME="Monitor Link Shares" SCRIPT_EXPLAINER="This script creates a script which monitors link shares and sends a mail or notification if new link shares were created in Nextcloud." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/not-supported/not-supported.sh b/not-supported/not-supported.sh index 97b939cb..adc6b7a1 100644 --- a/not-supported/not-supported.sh +++ b/not-supported/not-supported.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Not-supported Menu" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/not-supported/not-supported_menu.sh b/not-supported/not-supported_menu.sh index f450afe9..de6d8377 100644 --- a/not-supported/not-supported_menu.sh +++ b/not-supported/not-supported_menu.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Not-supported Menu" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/not-supported/ntfs-format.sh b/not-supported/ntfs-format.sh index 288f20cf..3ab548fb 100644 --- a/not-supported/ntfs-format.sh +++ b/not-supported/ntfs-format.sh @@ -7,7 +7,7 @@ true SCRIPT_NAME="NTFS Mount" SCRIPT_EXPLAINER="This script automates formatting drives to NTFS." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/not-supported/ntfs-mount.sh b/not-supported/ntfs-mount.sh index 39a9a31d..cef66ce9 100644 --- a/not-supported/ntfs-mount.sh +++ b/not-supported/ntfs-mount.sh @@ -7,7 +7,7 @@ true SCRIPT_NAME="NTFS Mount" SCRIPT_EXPLAINER="This script automates mounting NTFS drives locally in your system." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/not-supported/offshore-backup-wizard.sh b/not-supported/offshore-backup-wizard.sh index 12a39358..6a2de65b 100644 --- a/not-supported/offshore-backup-wizard.sh +++ b/not-supported/offshore-backup-wizard.sh @@ -7,7 +7,7 @@ true SCRIPT_NAME="Off-Shore Backup Wizard" SCRIPT_EXPLAINER="This script helps creating an off-shore backup script for your server." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON @@ -270,7 +270,7 @@ true SCRIPT_NAME="Off-Shore Rsync Backup" SCRIPT_EXPLAINER="This script executes the off-shore rsync backup." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/not-supported/pi-hole.sh b/not-supported/pi-hole.sh index 71620ca0..2e03a740 100644 --- a/not-supported/pi-hole.sh +++ b/not-supported/pi-hole.sh @@ -10,7 +10,7 @@ SCRIPT_EXPLAINER="The Pi-hole® is a DNS sinkhole that protects your devices fro without installing any client-side software. This is their official website: https://pi-hole.net" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/not-supported/pivpn.sh b/not-supported/pivpn.sh index dfd69686..6bf429f3 100644 --- a/not-supported/pivpn.sh +++ b/not-supported/pivpn.sh @@ -9,7 +9,7 @@ SCRIPT_EXPLAINER="PiVPN is one of the fastest and most user friendly ways to get This script will set up a Wireguard VPN server to connect devices to your home net from everywhere. Wireguard is a relatively new VPN protocol, that is much faster and better then e.g. OpenVPN." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/not-supported/plexmediaserver.sh b/not-supported/plexmediaserver.sh index d260a68c..9cbd19c2 100644 --- a/not-supported/plexmediaserver.sh +++ b/not-supported/plexmediaserver.sh @@ -8,7 +8,7 @@ SCRIPT_NAME="PLEX Media Server" SCRIPT_EXPLAINER="PLEX Media Server is a server application that let's \ you enjoy all your photos, music, videos, and movies in one place." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/not-supported/remotedesktop.sh b/not-supported/remotedesktop.sh index 13c21afc..d8521b80 100644 --- a/not-supported/remotedesktop.sh +++ b/not-supported/remotedesktop.sh @@ -8,7 +8,7 @@ SCRIPT_NAME="Remotedesktop" SCRIPT_EXPLAINER="This script simplifies the installation of XRDP which allows you to connect via RDP from other devices \ and offers some additional applications that you can choose to install." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/not-supported/restore-backup.sh b/not-supported/restore-backup.sh index 9bf5de10..1d147879 100644 --- a/not-supported/restore-backup.sh +++ b/not-supported/restore-backup.sh @@ -9,7 +9,7 @@ SCRIPT_NAME="Restore Backup" SCRIPT_EXPLAINER="This script allows to restore Nextcloud and other important data that are \ stored on the system partition on different installations than the borg-backup was initially made." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/not-supported/rsyncbackup.sh b/not-supported/rsyncbackup.sh index 52a7daca..2d099011 100644 --- a/not-supported/rsyncbackup.sh +++ b/not-supported/rsyncbackup.sh @@ -7,7 +7,7 @@ true SCRIPT_NAME="Rsync Backup" SCRIPT_EXPLAINER="This script creates the off-shore backup of your server." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/not-supported/smbserver.sh b/not-supported/smbserver.sh index 59a8e5f9..6151f53e 100644 --- a/not-supported/smbserver.sh +++ b/not-supported/smbserver.sh @@ -10,7 +10,7 @@ It helps you manage all SMB-users and SMB-shares. As bonus feature you can automatically mount the chosen directories to Nextcloud and \ create Nextcloud users with the same credentials like your SMB-users." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/not-supported/system-restore.sh b/not-supported/system-restore.sh index 8611abf7..716c9fa4 100644 --- a/not-supported/system-restore.sh +++ b/not-supported/system-restore.sh @@ -7,7 +7,7 @@ true SCRIPT_NAME="System Restore" SCRIPT_EXPLAINER="This script let's you restore your system- and boot-partition to a previous state." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/not-supported/tpm2-unlock.sh b/not-supported/tpm2-unlock.sh index 9a1f7f38..2945cb7e 100644 --- a/not-supported/tpm2-unlock.sh +++ b/not-supported/tpm2-unlock.sh @@ -8,7 +8,7 @@ SCRIPT_NAME="TPM2 Unlock" SCRIPT_EXPLAINER="This script helps automatically unlocking the root partition during boot \ and securing your GRUB (bootloader)." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/not-supported/veracrypt-btrfs.sh b/not-supported/veracrypt-btrfs.sh index 254a9875..01ca9c8a 100644 --- a/not-supported/veracrypt-btrfs.sh +++ b/not-supported/veracrypt-btrfs.sh @@ -7,7 +7,7 @@ true SCRIPT_NAME="Veracrypt" SCRIPT_EXPLAINER="This script automates formatting, encrypting and mounting drives with Veracrypt." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON @@ -370,7 +370,7 @@ chown root:root "$SCRIPTS/scrub-btrfs-weekly.sh" chmod 700 "$SCRIPTS/scrub-btrfs-weekly.sh" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh SNAPSHOT fi cat << SNAPSHOT >> "$SCRIPTS/scrub-btrfs-weekly.sh" diff --git a/not-supported/veracrypt-ntfs.sh b/not-supported/veracrypt-ntfs.sh index d910aade..1cfe031b 100644 --- a/not-supported/veracrypt-ntfs.sh +++ b/not-supported/veracrypt-ntfs.sh @@ -7,7 +7,7 @@ true SCRIPT_NAME="Veracrypt" SCRIPT_EXPLAINER="This script automates formatting, encrypting and mounting drives with Veracrypt." # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/old/format-sda-nuc-server.sh b/old/format-sda-nuc-server.sh index e96f81c9..20951ae2 100644 --- a/old/format-sda-nuc-server.sh +++ b/old/format-sda-nuc-server.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Format sda NUC Server" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check if root root_check diff --git a/old/modsecurity.sh b/old/modsecurity.sh index fabc8c72..34ac6cd0 100644 --- a/old/modsecurity.sh +++ b/old/modsecurity.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Modsecurity" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh print_text_in_color "$ICyan" "Installing ModSecurity..." diff --git a/old/ntpdate.sh b/old/ntpdate.sh index 94d5e5dc..1009700b 100644 --- a/old/ntpdate.sh +++ b/old/ntpdate.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Ntpdate" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/old/spreedme.sh b/old/spreedme.sh index fbaf4e5a..58f5756e 100644 --- a/old/spreedme.sh +++ b/old/spreedme.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Spreedme" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Get all needed variables from the library nc_update diff --git a/old/test_connection.sh b/old/test_connection.sh index 7f12a97d..1f02c5c6 100644 --- a/old/test_connection.sh +++ b/old/test_connection.sh @@ -2,7 +2,7 @@ true SCRIPT_NAME="Test connection" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # T&M Hansson IT AB © - 2022, https://www.hanssonit.se/ diff --git a/static/adduser.sh b/static/adduser.sh index d3411309..6d3e3bbb 100644 --- a/static/adduser.sh +++ b/static/adduser.sh @@ -2,7 +2,7 @@ true SCRIPT_NAME="Add CLI User" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # T&M Hansson IT AB © - 2022, https://www.hanssonit.se/ diff --git a/static/change-ncadmin-profile.sh b/static/change-ncadmin-profile.sh index fba45f6d..429ffc2d 100644 --- a/static/change-ncadmin-profile.sh +++ b/static/change-ncadmin-profile.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Change ncadmin Profile" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/static/change-root-profile.sh b/static/change-root-profile.sh index 32d1e8e9..b7be5c32 100644 --- a/static/change-root-profile.sh +++ b/static/change-root-profile.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Change root Profile" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/static/change_db_pass.sh b/static/change_db_pass.sh index d82f4b0e..252acce8 100644 --- a/static/change_db_pass.sh +++ b/static/change_db_pass.sh @@ -2,7 +2,7 @@ true SCRIPT_NAME="Change Database Password" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Get all needed variables from the library ncdb diff --git a/static/docker_overlay2.sh b/static/docker_overlay2.sh index 286534c9..b7e9b005 100644 --- a/static/docker_overlay2.sh +++ b/static/docker_overlay2.sh @@ -2,7 +2,7 @@ true SCRIPT_NAME="Change to Docker overlay2" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # T&M Hansson IT AB © - 2022, https://www.hanssonit.se/ diff --git a/static/setup_secure_permissions_nextcloud.sh b/static/setup_secure_permissions_nextcloud.sh index f8f5837e..5b2764b9 100644 --- a/static/setup_secure_permissions_nextcloud.sh +++ b/static/setup_secure_permissions_nextcloud.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Set up Secure Permissions for Nextcloud" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON @@ -28,7 +28,7 @@ then if [ -z "${NCDATA}" ] then # shellcheck source=lib.sh - source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) + source /var/scripts/fetch_lib.sh fi fi diff --git a/static/temporary-fix-begining.sh b/static/temporary-fix-begining.sh index 5cc61f6a..36176014 100644 --- a/static/temporary-fix-begining.sh +++ b/static/temporary-fix-begining.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Temporary Fix" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/static/temporary-fix-end.sh b/static/temporary-fix-end.sh index 5cc61f6a..36176014 100644 --- a/static/temporary-fix-end.sh +++ b/static/temporary-fix-end.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Temporary Fix" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Check for errors + debug code and abort if something isn't right # 1 = ON diff --git a/static/updatenotification.sh b/static/updatenotification.sh index 97f6b46b..912555bd 100644 --- a/static/updatenotification.sh +++ b/static/updatenotification.sh @@ -5,7 +5,7 @@ true SCRIPT_NAME="Update Notification" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh # Get all needed variables from the library nc_update diff --git a/vagrant/install.sh b/vagrant/install.sh index 59dc1e3c..6e4369ec 100644 --- a/vagrant/install.sh +++ b/vagrant/install.sh @@ -3,7 +3,7 @@ true SCRIPT_NAME="Install NcVM with Vagrant" # shellcheck source=lib.sh -source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh) +source /var/scripts/fetch_lib.sh check_command git clone https://github.com/nextcloud/vm.git |