diff --git a/.github/ISSUE_TEMPLATE/1_Bug_report.md b/.github/ISSUE_TEMPLATE/1_Bug_report.md index d31d1c46b..44ceab9c8 100644 --- a/.github/ISSUE_TEMPLATE/1_Bug_report.md +++ b/.github/ISSUE_TEMPLATE/1_Bug_report.md @@ -5,7 +5,7 @@ about: Report errors and problems --- " ## -open_summary "NextCloudPi diagnostics" +open_summary "NextcloudPi diagnostics" bash /usr/local/bin/ncp-diag | sed -r 's=(IP|certificates|gateway).*=\1|***REMOVED SENSITIVE VALUE***=g' | column -t -s'|' close_summary diff --git a/bin/ncp-suggestions b/bin/ncp-suggestions index 39f2cedac..2dd597a41 100644 --- a/bin/ncp-suggestions +++ b/bin/ncp-suggestions @@ -1,7 +1,7 @@ #!/bin/bash # -# NextCloudPi configuration suggestions +# NextcloudPi configuration suggestions # # Copyleft 2018 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! @@ -15,7 +15,7 @@ OUT="$@" source /usr/local/etc/library.sh - + check_distro || \ echo -e "You are using an outdated distro release. You should upgrade to latest Debian/Raspbian" diff --git a/bin/ncp-update b/bin/ncp-update index b6f7a333f..89e4c9fef 100755 --- a/bin/ncp-update +++ b/bin/ncp-update @@ -1,6 +1,6 @@ #!/bin/bash -# update latest NextCloudPi code from github +# update latest NextcloudPi code from github [[ -z "$DBG" ]] || set -$DBG @@ -59,6 +59,6 @@ fi sed '/HEAD ->\|origin/s|\[.*\(tag: v[0-9]\+\.[0-9]\+\.[0-9]\+\).*\]|[\1]|' | \ sed 's|* \[tag: |[|' > /usr/local/etc/ncp-changelog - echo -e "NextCloudPi updated to version $VER" + echo -e "NextcloudPi updated to version $VER" exit 0 } # force to read the whole thing into memory, as its contents might change in update.sh diff --git a/bin/ncp-update-nc b/bin/ncp-update-nc index 60e8486f0..7d1930276 100755 --- a/bin/ncp-update-nc +++ b/bin/ncp-update-nc @@ -94,7 +94,7 @@ wget -q "$URL" -O nextcloud.tar.bz2 || { echo "Error downloading"; exit 1; } # backup #################### -BKPDIR=/var/www/ +BKPDIR="$BASEDIR" WITH_DATA=no COMPRESSED=yes LIMIT=0 @@ -165,7 +165,7 @@ rollback() { rm -rf /var/www/nextcloud.tar.bz2 "$BASEDIR"/nextcloud-old echo "Rolling back to backup $BKP..." local TMPDATA - TMPDATA="$( mktemp -d "/var/www/ncp-data.XXXXXX" )" || { echo "Failed to create temp dir" >&2; exit 1; } + TMPDATA="$( mktemp -d "$BASEDIR/recovery/ncp-data.XXXXXX" )" || { echo "Failed to create temp dir" >&2; exit 1; } [[ "$DATADIR" == "$BASEDIR/nextcloud/data" ]] && mv -T "$DATADIR" "$TMPDATA" ncp-restore "$BKP" || { echo "Rollback failed! Data left at $TMPDATA"; exit 1; } [[ "$DATADIR" == "$BASEDIR/nextcloud/data" ]] && { rm -rf "$DATADIR"; mv -T "$TMPDATA" "$DATADIR"; } diff --git a/bin/ncp/BACKUPS/nc-export-ncp.sh b/bin/ncp/BACKUPS/nc-export-ncp.sh index 9e0660b41..579c62a2c 100644 --- a/bin/ncp/BACKUPS/nc-export-ncp.sh +++ b/bin/ncp/BACKUPS/nc-export-ncp.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Export NextCloudPi configuration +# Export NextcloudPi configuration # # # Copyleft 2017 by Courtney Hicks @@ -9,7 +9,7 @@ -configure() +configure() { [[ -d "$DIR" ]] || { echo "directory $DIR does not exist"; return 1; } diff --git a/bin/ncp/BACKUPS/nc-import-ncp.sh b/bin/ncp/BACKUPS/nc-import-ncp.sh index 1368829e6..b55af93f3 100644 --- a/bin/ncp/BACKUPS/nc-import-ncp.sh +++ b/bin/ncp/BACKUPS/nc-import-ncp.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Import NextCloudPi configuration +# Import NextcloudPi configuration # # # Copyleft 2017 by Courtney Hicks diff --git a/bin/ncp/BACKUPS/nc-snapshot-auto.sh b/bin/ncp/BACKUPS/nc-snapshot-auto.sh index 51e26ce60..87bf038e2 100644 --- a/bin/ncp/BACKUPS/nc-snapshot-auto.sh +++ b/bin/ncp/BACKUPS/nc-snapshot-auto.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# NextCloudPi scheduled datadir BTRFS snapshots +# NextcloudPi scheduled datadir BTRFS snapshots # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! diff --git a/bin/ncp/CONFIG/nc-database.sh b/bin/ncp/CONFIG/nc-database.sh index 54b10d358..468e00052 100644 --- a/bin/ncp/CONFIG/nc-database.sh +++ b/bin/ncp/CONFIG/nc-database.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Data dir configuration script for NextCloudPi +# Data dir configuration script for NextcloudPi # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! diff --git a/bin/ncp/CONFIG/nc-datadir.sh b/bin/ncp/CONFIG/nc-datadir.sh index 3a0061d4c..a2de971be 100644 --- a/bin/ncp/CONFIG/nc-datadir.sh +++ b/bin/ncp/CONFIG/nc-datadir.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Data dir configuration script for NextCloudPi +# Data dir configuration script for NextcloudPi # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! diff --git a/bin/ncp/CONFIG/nc-httpsonly.sh b/bin/ncp/CONFIG/nc-httpsonly.sh index e51b1b7cc..ce8fb5a39 100644 --- a/bin/ncp/CONFIG/nc-httpsonly.sh +++ b/bin/ncp/CONFIG/nc-httpsonly.sh @@ -1,6 +1,6 @@ #!/bin/bash -# HTTPS rewrite configuration script for NextCloudPi +# HTTPS rewrite configuration script for NextcloudPi # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! diff --git a/bin/ncp/CONFIG/nc-init.sh b/bin/ncp/CONFIG/nc-init.sh index 99f319a02..d58ce3125 100644 --- a/bin/ncp/CONFIG/nc-init.sh +++ b/bin/ncp/CONFIG/nc-init.sh @@ -126,7 +126,7 @@ EOF } mysql nextcloud < # GPL licensed (see end of file) * Use at your own risk! diff --git a/bin/ncp/CONFIG/nc-trusted-domains.sh b/bin/ncp/CONFIG/nc-trusted-domains.sh index 39144e901..beadecf1f 100644 --- a/bin/ncp/CONFIG/nc-trusted-domains.sh +++ b/bin/ncp/CONFIG/nc-trusted-domains.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Manually add trusted domains in NextCloudPi +# Manually add trusted domains in NextcloudPi # # Copyleft 2019 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! diff --git a/bin/ncp/NETWORKING/duckDNS.sh b/bin/ncp/NETWORKING/duckDNS.sh index 4a16b7dd5..e7aaf7765 100644 --- a/bin/ncp/NETWORKING/duckDNS.sh +++ b/bin/ncp/NETWORKING/duckDNS.sh @@ -1,6 +1,6 @@ #!/bin/bash -# DuckDNS installation on Raspbian for NextCloudPi +# DuckDNS installation on Raspbian for NextcloudPi # # # Copyleft 2017 by Courtney Hicks @@ -12,7 +12,7 @@ INSTALLDIR=duckdns INSTALLPATH=/usr/local/etc/$INSTALLDIR CRONFILE=/etc/cron.d/duckdns -configure() +configure() { local DOMAIN="$( sed 's|.duckdns.org||' <<<"$DOMAIN" )" if [[ $ACTIVE == "yes" ]]; then @@ -23,7 +23,7 @@ configure() touch "$INSTALLPATH"/duck.log echo -e "echo url=\"https://www.duckdns.org/update?domains=$DOMAIN&token=$TOKEN&ip=\" | curl -k -o "$INSTALLPATH"/duck.log -K -" > "$INSTALLPATH"/duck.sh - # Adds file to cron to run script for DNS record updates and change permissions + # Adds file to cron to run script for DNS record updates and change permissions touch $CRONFILE echo "*/5 * * * * root $INSTALLPATH/duck.sh >/dev/null 2>&1" > "$CRONFILE" chmod 700 "$INSTALLPATH"/duck.sh diff --git a/bin/ncp/NETWORKING/letsencrypt.sh b/bin/ncp/NETWORKING/letsencrypt.sh index 0dfc93943..cdb8653a3 100644 --- a/bin/ncp/NETWORKING/letsencrypt.sh +++ b/bin/ncp/NETWORKING/letsencrypt.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Let's encrypt certbot installation on NextCloudPi +# Let's encrypt certbot installation on NextcloudPi # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! diff --git a/bin/ncp/NETWORKING/nc-forward-ports.sh b/bin/ncp/NETWORKING/nc-forward-ports.sh index aab6c9d47..d7c8f14c7 100644 --- a/bin/ncp/NETWORKING/nc-forward-ports.sh +++ b/bin/ncp/NETWORKING/nc-forward-ports.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Use uPnP to forward router ports for NextCloudPi +# Use uPnP to forward router ports for NextcloudPi # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! @@ -15,7 +15,7 @@ install() DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends miniupnpc } -configure() +configure() { local ip ip="$(get_ip)" diff --git a/bin/ncp/NETWORKING/nc-static-IP.sh b/bin/ncp/NETWORKING/nc-static-IP.sh index 63ce705f5..c5a058186 100644 --- a/bin/ncp/NETWORKING/nc-static-IP.sh +++ b/bin/ncp/NETWORKING/nc-static-IP.sh @@ -8,7 +8,7 @@ # More at: https://ownyourbits.com # -configure() +configure() { local GW="$( ip r | grep "default via" | awk '{ print $3 }' | head -1 )" local DNS="$( grep nameserver /etc/resolv.conf | head -1 | awk '{ print $2 }' )" @@ -19,8 +19,8 @@ configure() ## DHCPCD [[ -f /etc/dhcpcd.conf ]] && { # delete NCP config - grep -q "^# NextCloudPi autogenerated" /etc/dhcpcd.conf && \ - sed -i '/^# NextCloudPi autogenerated/,+6d' /etc/dhcpcd.conf + grep -q "^# Next(c|C)loudPi autogenerated" /etc/dhcpcd.conf && \ + sed -i '/^# Next(c|C)loudPi autogenerated/,+6d' /etc/dhcpcd.conf [[ $ACTIVE != "yes" ]] && { systemctl restart dhcpcd @@ -29,7 +29,7 @@ configure() } cat >> /etc/dhcpcd.conf < # GPL licensed (see end of file) * Use at your own risk! diff --git a/bin/ncp/NETWORKING/no-ip.sh b/bin/ncp/NETWORKING/no-ip.sh index a9ccdb5c9..1924c69b0 100644 --- a/bin/ncp/NETWORKING/no-ip.sh +++ b/bin/ncp/NETWORKING/no-ip.sh @@ -1,6 +1,6 @@ #!/bin/bash -# no-ip.org installation on NextCloudPi +# no-ip.org installation on NextcloudPi # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! diff --git a/bin/ncp/NETWORKING/samba.sh b/bin/ncp/NETWORKING/samba.sh index ca58cb9d4..4269995a9 100644 --- a/bin/ncp/NETWORKING/samba.sh +++ b/bin/ncp/NETWORKING/samba.sh @@ -27,7 +27,7 @@ install() cat >> /etc/samba/smb.conf <> /etc/samba/smb.conf < "$INSTALLPATH"/spdnsUpdater.sh <<'EOF' + cat > "$INSTALLPATH"/spdnsUpdater.sh <<'EOF' #!/bin/bash ### Usage @@ -39,14 +39,14 @@ update_url="https://update.spdyn.de/nic/update" ### Update procedure -function spdnsUpdater { +function spdnsUpdater { # Send the current IP address to spdyn.de # and show the response - + params=$1 updater=$(wget -qO- --post-data $params $update_url) updater=$(echo $updater | grep -o '^[a-z]*') - + case "$updater" in abuse) echo "[$updater] Der Host kann nicht aktualisiert werden, da er aufgrund vorheriger fehlerhafter Updateversuche gesperrt ist." ;; @@ -89,10 +89,10 @@ EOF } -configure() +configure() { if [[ $ACTIVE == "yes" ]]; then - + # Adds file to cron to run script for DNS record updates and change permissions touch $CRONFILE echo "10 * * * * root $INSTALLPATH/spdnsUpdater.sh $DOMAIN $TOKEN >/dev/null 2>&1" > "$CRONFILE" @@ -100,7 +100,7 @@ configure() # First-time execution of update script and print response from spdns.de server "$INSTALLPATH"/spdnsUpdater.sh "$DOMAIN" "$TOKEN" - + echo -e "\nspdnsUpdater is now enabled" # Removes config files and cron job if ACTIVE_ is set to no diff --git a/bin/ncp/SECURITY/fail2ban.sh b/bin/ncp/SECURITY/fail2ban.sh index a2daade22..6f0afda2e 100644 --- a/bin/ncp/SECURITY/fail2ban.sh +++ b/bin/ncp/SECURITY/fail2ban.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Fail2ban for NextCloudPi +# Fail2ban for NextcloudPi # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! @@ -30,7 +30,7 @@ install() # tweak fail2ban email local F=/etc/fail2ban/action.d/sendmail-common.conf - sed -i 's|Fail2Ban|NextCloudPi|' /etc/fail2ban/action.d/sendmail-whois-lines.conf + sed -i 's|Fail2Ban|NextcloudPi|' /etc/fail2ban/action.d/sendmail-whois-lines.conf grep -q actionstart_ "$F" || sed -i 's|actionstart|actionstart_|' "$F" grep -q actionstop_ "$F" || sed -i 's|actionstop|actionstop_|' "$F" diff --git a/bin/ncp/SECURITY/modsecurity.sh b/bin/ncp/SECURITY/modsecurity.sh index 44f5b2511..629e189c6 100644 --- a/bin/ncp/SECURITY/modsecurity.sh +++ b/bin/ncp/SECURITY/modsecurity.sh @@ -1,6 +1,6 @@ #!/bin/bash -# modsecurity WAF installation on Raspbian +# modsecurity WAF installation on Raspbian # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! @@ -16,7 +16,7 @@ install() cat >> /etc/modsecurity/crs/crs-setup.conf <<'EOF' - # NextCloudPi: allow PROPFIND for webDAV + # NextcloudPi: allow PROPFIND for webDAV SecAction "id:900200, phase:1, nolog, pass, t:none, setvar:'tx.allowed_methods=GET HEAD POST OPTIONS PROPFIND'" EOF @@ -37,8 +37,8 @@ EOF EOF } -configure() -{ +configure() +{ local NCDIR=/var/www/nextcloud/ local NCPWB=/var/www/ncp-web/ diff --git a/bin/ncp/SECURITY/nc-audit.sh b/bin/ncp/SECURITY/nc-audit.sh index 0668ecdbe..df0cc90d6 100644 --- a/bin/ncp/SECURITY/nc-audit.sh +++ b/bin/ncp/SECURITY/nc-audit.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Launch security audit reports for NextCloudPi +# Launch security audit reports for NextcloudPi # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! @@ -22,7 +22,7 @@ skip-test=CUST-0810 # Won't install puppet or similar skip-test=TOOL-5002 -# Raspbian doesn't have security sources ( https://www.raspberrypi.org/forums/viewtopic.php?t=98006&p=680175 ) +# Raspbian doesn't have security sources ( https://www.raspberrypi.org/forums/viewtopic.php?t=98006&p=680175 ) skip-test=PKGS-7388 # We have a preset partition scheme in the SD card diff --git a/bin/ncp/SECURITY/nc-encrypt.sh b/bin/ncp/SECURITY/nc-encrypt.sh index 862a5ee0d..99a4ec34e 100644 --- a/bin/ncp/SECURITY/nc-encrypt.sh +++ b/bin/ncp/SECURITY/nc-encrypt.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Data at rest encryption for NextCloudPi +# Data at rest encryption for NextcloudPi # # Copyleft 2021 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! diff --git a/bin/ncp/SYSTEM/nc-automount.sh b/bin/ncp/SYSTEM/nc-automount.sh index ca6315270..dc3e24ce9 100644 --- a/bin/ncp/SYSTEM/nc-automount.sh +++ b/bin/ncp/SYSTEM/nc-automount.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Automount configuration for NextCloudPi +# Automount configuration for NextcloudPi # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! diff --git a/bin/ncp/SYSTEM/nc-hdd-monitor.sh b/bin/ncp/SYSTEM/nc-hdd-monitor.sh index 4b99da7e3..d89a6806b 100644 --- a/bin/ncp/SYSTEM/nc-hdd-monitor.sh +++ b/bin/ncp/SYSTEM/nc-hdd-monitor.sh @@ -47,7 +47,7 @@ EOF source /usr/local/etc/library.sh wall "\$SMARTD_MESSAGE" notify_admin \ - "NextCloudPi HDD health \$SMARTD_FAILTYPE" \ + "NextcloudPi HDD health \$SMARTD_FAILTYPE" \ "\$SMARTD_MESSAGE" EOF chmod +x /usr/local/etc/ncp-hdd-notif.sh diff --git a/bin/ncp/SYSTEM/nc-ramlogs.sh b/bin/ncp/SYSTEM/nc-ramlogs.sh index 5cf8d41ff..e239de18c 100644 --- a/bin/ncp/SYSTEM/nc-ramlogs.sh +++ b/bin/ncp/SYSTEM/nc-ramlogs.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Data dir configuration script for NextCloudPi +# Data dir configuration script for NextcloudPi # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! diff --git a/bin/ncp/SYSTEM/nc-swapfile.sh b/bin/ncp/SYSTEM/nc-swapfile.sh index 008f4eb99..e87f41328 100644 --- a/bin/ncp/SYSTEM/nc-swapfile.sh +++ b/bin/ncp/SYSTEM/nc-swapfile.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Data dir configuration script for NextCloudPi +# Data dir configuration script for NextcloudPi # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! diff --git a/bin/ncp/SYSTEM/nc-zram.sh b/bin/ncp/SYSTEM/nc-zram.sh index c8b476609..90cd17e7a 100644 --- a/bin/ncp/SYSTEM/nc-zram.sh +++ b/bin/ncp/SYSTEM/nc-zram.sh @@ -1,6 +1,6 @@ #!/bin/bash -# NextCloudPi ZRAM settings +# NextcloudPi ZRAM settings # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! @@ -63,7 +63,7 @@ chmod +x /usr/local/bin/ncp-zram configure() { - [[ $ACTIVE != "yes" ]] && { + [[ $ACTIVE != "yes" ]] && { systemctl stop zram systemctl disable zram echo "ZRAM disabled" diff --git a/bin/ncp/UPDATES/nc-autoupdate-nc.sh b/bin/ncp/UPDATES/nc-autoupdate-nc.sh index 613e7803f..02d8972ca 100644 --- a/bin/ncp/UPDATES/nc-autoupdate-nc.sh +++ b/bin/ncp/UPDATES/nc-autoupdate-nc.sh @@ -29,7 +29,7 @@ if [[ \${PIPESTATUS[0]} -eq 0 ]]; then VER="\$( /usr/local/bin/ncc status | grep "version:" | awk '{ print \$3 }' )" - notify_admin "NextCloudPi" "Nextcloud was updated to \$VER" + notify_admin "NextcloudPi" "Nextcloud was updated to \$VER" fi echo "" >> /var/log/ncp.log EOF diff --git a/bin/ncp/UPDATES/nc-autoupdate-ncp.sh b/bin/ncp/UPDATES/nc-autoupdate-ncp.sh index fd205d4c4..5f721d2e4 100644 --- a/bin/ncp/UPDATES/nc-autoupdate-ncp.sh +++ b/bin/ncp/UPDATES/nc-autoupdate-ncp.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Automatically apply NextCloudPi updates +# Automatically apply NextcloudPi updates # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! @@ -11,9 +11,9 @@ configure() { - [[ $ACTIVE != "yes" ]] && { + [[ $ACTIVE != "yes" ]] && { rm -f /etc/cron.daily/ncp-autoupdate - echo "automatic NextCloudPi updates disabled" + echo "automatic NextcloudPi updates disabled" return 0 } @@ -25,11 +25,11 @@ exec >> /var/log/ncp.log 2>&1 echo "\$(date) - Running \$0..." if /usr/local/bin/ncp-test-updates; then /usr/local/bin/ncp-update || exit 1 - notify_admin "NextCloudPi" "NextCloudPi was updated to \$(cat /usr/local/etc/ncp-version)" + notify_admin "NextcloudPi" "NextcloudPi was updated to \$(cat /usr/local/etc/ncp-version)" fi EOF chmod 755 /etc/cron.daily/ncp-autoupdate - echo "automatic NextCloudPi updates enabled" + echo "automatic NextcloudPi updates enabled" } install() { :; } diff --git a/bin/ncp/UPDATES/nc-notify-updates.sh b/bin/ncp/UPDATES/nc-notify-updates.sh index 95670238b..6502b29a3 100644 --- a/bin/ncp/UPDATES/nc-notify-updates.sh +++ b/bin/ncp/UPDATES/nc-notify-updates.sh @@ -33,7 +33,7 @@ NOTIFIED=/var/run/.ncp-version-notified /usr/local/bin/ncp-check-nc-version test -e $LATEST || exit 0; -/usr/local/bin/ncp-test-updates || { echo "NextCloudPi up to date"; exit 0; } +/usr/local/bin/ncp-test-updates || { echo "NextcloudPi up to date"; exit 0; } test -e $NOTIFIED && [[ "$( cat $LATEST )" == "$( cat $NOTIFIED )" ]] && { echo "Found update from $( cat $VERFILE ) to $( cat $LATEST ). Already notified" @@ -43,7 +43,7 @@ test -e $NOTIFIED && [[ "$( cat $LATEST )" == "$( cat $NOTIFIED )" ]] && { echo "Found update from $( cat $VERFILE ) to $( cat $LATEST ). Sending notification..." notify_admin \ - "NextCloudPi update" \ + "NextcloudPi update" \ "Update from $( cat $VERFILE ) to $( cat $LATEST ) is available. Update from https://$(get_ip):4443" cat $LATEST > $NOTIFIED @@ -75,7 +75,7 @@ echo -e "Packages automatically upgraded: $PKGS\n" # notify notify_admin \ - "NextCloudPi Unattended Upgrades" \ + "NextcloudPi Unattended Upgrades" \ "Packages automatically upgraded $PKGS" EOF chmod +x /usr/local/bin/ncp-notify-unattended-upgrade diff --git a/bin/ncp/UPDATES/nc-update.sh b/bin/ncp/UPDATES/nc-update.sh index 7394c833d..48fc0ac78 100644 --- a/bin/ncp/UPDATES/nc-update.sh +++ b/bin/ncp/UPDATES/nc-update.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Data dir configuration script for NextCloudPi +# Data dir configuration script for NextcloudPi # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! diff --git a/bin/ncp/UPDATES/unattended-upgrades.sh b/bin/ncp/UPDATES/unattended-upgrades.sh index d708c0d30..63f37d252 100644 --- a/bin/ncp/UPDATES/unattended-upgrades.sh +++ b/bin/ncp/UPDATES/unattended-upgrades.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Unattended upgrades installation on NextCloudPi +# Unattended upgrades installation on NextcloudPi # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! diff --git a/build/armbian/armbian.sh b/build/armbian/armbian.sh index 924f6f94e..d546b456c 100644 --- a/build/armbian/armbian.sh +++ b/build/armbian/armbian.sh @@ -2,7 +2,7 @@ # arguments: $RELEASE $LINUXFAMILY $BOARD $BUILD_DESKTOP -# This is the image customization script for NextCloudPi on Armbian +# This is the image customization script for NextcloudPi on Armbian # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! @@ -25,7 +25,7 @@ source etc/library.sh # sets RELEASE chage -d -1 root # install NCP -echo -e "\nInstalling NextCloudPi" +echo -e "\nInstalling NextcloudPi" hostname -F /etc/hostname # fix 'sudo resolve host' errors diff --git a/build/batch.sh b/build/batch.sh index bb093b27a..72b69e581 100755 --- a/build/batch.sh +++ b/build/batch.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Batch creation of NextCloudPi images and containers +# Batch creation of NextcloudPi images and containers # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! diff --git a/build/build-LXC.sh b/build/build-LXC.sh index 76996ff30..50769e6e4 100755 --- a/build/build-LXC.sh +++ b/build/build-LXC.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Batch creation of NextCloudPi LXC image +# Batch creation of NextcloudPi LXC image # # Copyleft 2021 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! @@ -14,7 +14,7 @@ source build/buildlib.sh echo -e "\e[1m\n[ Build NCP LXC ]\e[0m" #CLEAN=0 # Pass this envvar to skip cleaning download cache -IMG="NextCloudPi_LXC_$( date "+%m-%d-%y" ).img" +IMG="NextcloudPi_LXC_$( date "+%m-%d-%y" ).img" IMG=tmp/"$IMG" TAR=output/"$( basename "$IMG" .img ).tar.bz2" diff --git a/build/build-LXD.sh b/build/build-LXD.sh index c695e769e..f35b395ae 100755 --- a/build/build-LXD.sh +++ b/build/build-LXD.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Batch creation of NextCloudPi LXD image +# Batch creation of NextcloudPi LXD image # # Copyleft 2021 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! @@ -14,7 +14,7 @@ source build/buildlib.sh echo -e "\e[1m\n[ Build NCP LXD ]\e[0m" #CLEAN=0 # Pass this envvar to skip cleaning download cache -IMG="NextCloudPi_LXD_$( date "+%m-%d-%y" ).img" +IMG="NextcloudPi_LXD_$( date "+%m-%d-%y" ).img" IMG=tmp/"$IMG" TAR=output/"$( basename "$IMG" .img ).tar.bz2" diff --git a/build/build-SD-armbian.sh b/build/build-SD-armbian.sh index fddc30c5a..3d3ab1168 100755 --- a/build/build-SD-armbian.sh +++ b/build/build-SD-armbian.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Batch creation of NextCloudPi Armbian based images +# Batch creation of NextcloudPi Armbian based images # # Copyleft 2018 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! @@ -18,7 +18,7 @@ NCPCFG=etc/ncp.cfg echo -e "\e[1m\n[ Build NCP ${BNAME} ]\e[0m" -IMG="${IMG:-NextCloudPi_${BNAME}_$( date "+%m-%d-%y" ).img}" +IMG="${IMG:-NextcloudPi_${BNAME}_$( date "+%m-%d-%y" ).img}" IMG=tmp/"$IMG" TAR=output/"$( basename "$IMG" .img ).tar.bz2" diff --git a/build/build-SD-berryboot.sh b/build/build-SD-berryboot.sh index 84ebf9eb9..c8d24b312 100755 --- a/build/build-SD-berryboot.sh +++ b/build/build-SD-berryboot.sh @@ -14,7 +14,7 @@ source build/buildlib.sh echo -e "\e[1m\n[ Build NCP Berryboot ]\e[0m" SRC="$1" -IMG="NextCloudPi_RPi_Berryboot_$( date "+%m-%d-%y" ).img" +IMG="NextcloudPi_RPi_Berryboot_$( date "+%m-%d-%y" ).img" TAR=output/"$( basename "$IMG" .img ).tar.bz2" test -f "$TAR" && { echo "$TAR already exists. Skipping... "; exit 0; } diff --git a/build/build-SD-rpi.sh b/build/build-SD-rpi.sh index d7cc0b709..e7fd447c0 100755 --- a/build/build-SD-rpi.sh +++ b/build/build-SD-rpi.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Batch creation of NextCloudPi image +# Batch creation of NextcloudPi image # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! @@ -16,7 +16,7 @@ echo -e "\e[1m\n[ Build NCP Raspberry Pi ]\e[0m" URL="https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2022-01-28/2022-01-28-raspios-bullseye-arm64-lite.zip" SIZE=4G # Raspbian image size #CLEAN=0 # Pass this envvar to skip cleaning download cache -IMG="${IMG:-NextCloudPi_RPi_$( date "+%m-%d-%y" ).img}" +IMG="${IMG:-NextcloudPi_RPi_$( date "+%m-%d-%y" ).img}" TAR=output/"$( basename "$IMG" .img ).tar.bz2" ############################################################################## diff --git a/build/build-VM.sh b/build/build-VM.sh index 87e4e654c..368691364 100755 --- a/build/build-VM.sh +++ b/build/build-VM.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Batch creation of NextCloudPi VM image +# Batch creation of NextcloudPi VM image # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! @@ -16,7 +16,7 @@ echo -e "\e[1m\n[ Build NCP VM ]\e[0m" IP=${1:-192.168.0.145} # For QEMU automated testing (optional) SIZE=3G # Raspbian image size #CLEAN=0 # Pass this envvar to skip cleaning download cache -IMG="${IMG:-NextCloudPi_VM_$( date "+%m-%d-%y" ).img}" +IMG="${IMG:-NextcloudPi_VM_$( date "+%m-%d-%y" ).img}" IMG=tmp/"$IMG" VM="/var/lib/libvirt/images/ncp-vm.img" diff --git a/build/build-docker.sh b/build/build-docker.sh index b6a9dedee..79354855c 100755 --- a/build/build-docker.sh +++ b/build/build-docker.sh @@ -1,4 +1,4 @@ -# Batch-build docker container layers for NextCloudPi +# Batch-build docker container layers for NextcloudPi # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! diff --git a/build/buildlib.sh b/build/buildlib.sh index 147d08b40..32e0186ef 100644 --- a/build/buildlib.sh +++ b/build/buildlib.sh @@ -321,7 +321,7 @@ function create_torrent() [[ -d "$DIR" ]] && { echo "dir $DIR already exists"; return 1; } mkdir -p torrent/"$IMGNAME" && cp -v --reflink=auto "$TAR" torrent/"$IMGNAME" md5sum "$DIR"/*.bz2 > "$DIR"/md5sum - createtorrent -a udp://tracker.opentrackr.org -p 1337 -c "NextCloudPi. Nextcloud ready to use image" "$DIR" "$DIR".torrent + createtorrent -a udp://tracker.opentrackr.org -p 1337 -c "NextcloudPi. Nextcloud ready to use image" "$DIR" "$DIR".torrent transmission-remote -w $(pwd)/torrent -a "$DIR".torrent } diff --git a/build/docker/nextcloud/020nextcloud b/build/docker/nextcloud/020nextcloud index edfe4b1d4..e3f6ff6ad 100755 --- a/build/docker/nextcloud/020nextcloud +++ b/build/docker/nextcloud/020nextcloud @@ -76,7 +76,7 @@ bash /usr/local/bin/nextcloud-domain.sh ncc notify_push:self-test > /dev/null 2>&1 || ncc notify_push:setup "https://$2/push" } -echo "Nextcloud version $(nc_version). NextCloudPi version $(cat /usr/local/etc/ncp-version)" +echo "Nextcloud version $(nc_version). NextcloudPi version $(cat /usr/local/etc/ncp-version)" # Display NC logs in the docker logs tail -f -n0 /data/nextcloud/data/nextcloud.log & diff --git a/etc/library.sh b/etc/library.sh index ee94cf3c8..3d6cf1268 100644 --- a/etc/library.sh +++ b/etc/library.sh @@ -1,6 +1,6 @@ #!/bin/bash -# NextCloudPi function library +# NextcloudPi function library # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! @@ -62,7 +62,7 @@ function configure_app() { local ncp_app="$1" local cfg_file="$CFGDIR/$ncp_app.cfg" - local backtitle="NextCloudPi installer configuration" + local backtitle="NextcloudPi installer configuration" local ret=1 # checks @@ -334,7 +334,7 @@ function info_app() [[ "$infotitle" == "" ]] || [[ "$infotitle" == "null" ]] && infotitle="Info" whiptail --yesno \ - --backtitle "NextCloudPi configuration" \ + --backtitle "NextcloudPi configuration" \ --title "$infotitle" \ --yes-button "I understand" \ --no-button "Go back" \ diff --git a/etc/ncp-config.d/l10n/nc-autoupdate-ncp/zh.json b/etc/ncp-config.d/l10n/nc-autoupdate-ncp/zh.json index 0a47c89ae..19427cd62 100644 --- a/etc/ncp-config.d/l10n/nc-autoupdate-ncp/zh.json +++ b/etc/ncp-config.d/l10n/nc-autoupdate-ncp/zh.json @@ -1,7 +1,7 @@ { "translations":{ "ACTIVE":"開啟", - "Automatically apply NextCloudPi updates":"自動更新NextcloudPi", + "Automatically apply NextcloudPi updates":"自動更新NextcloudPi", "nc-autoupdate-ncp":"自動更新NCP" } } diff --git a/etc/ncp-config.d/l10n/nc-export-ncp/es.json b/etc/ncp-config.d/l10n/nc-export-ncp/es.json index 7dfd62158..33200f639 100644 --- a/etc/ncp-config.d/l10n/nc-export-ncp/es.json +++ b/etc/ncp-config.d/l10n/nc-export-ncp/es.json @@ -1,7 +1,7 @@ { "translations": { "DIR": "Directorio", - "Export NextCloudPi configuration": "Exportar la configuración de NextCloudPi", + "Export NextcloudPi configuration": "Exportar la configuración de NextcloudPi", "nc-export-ncp": "nc-export-ncp" } } diff --git a/etc/ncp-config.d/l10n/nc-export-ncp/pt.json b/etc/ncp-config.d/l10n/nc-export-ncp/pt.json index 5a6c7d1c6..12419a3a2 100644 --- a/etc/ncp-config.d/l10n/nc-export-ncp/pt.json +++ b/etc/ncp-config.d/l10n/nc-export-ncp/pt.json @@ -1,7 +1,7 @@ { "translations": { "DIR": "Diretório", - "Export NextCloudPi configuration": "Exportar configurações do NextCloudPi", + "Export NextcloudPi configuration": "Exportar configurações do NextcloudPi", "nc-export-ncp": "nc-exportar-ncp" } } diff --git a/etc/ncp-config.d/l10n/nc-export-ncp/zh.json b/etc/ncp-config.d/l10n/nc-export-ncp/zh.json index ede28c0f0..b3283fcee 100644 --- a/etc/ncp-config.d/l10n/nc-export-ncp/zh.json +++ b/etc/ncp-config.d/l10n/nc-export-ncp/zh.json @@ -1,7 +1,7 @@ { "translations": { "DIR": "位置", - "Export NextCloudPi configuration": "匯出NextCloudPi設定", + "Export NextcloudPi configuration": "匯出NextcloudPi設定", "nc-export-ncp": "匯出NCP設定" } } diff --git a/etc/ncp-config.d/l10n/nc-forward-ports/es.json b/etc/ncp-config.d/l10n/nc-forward-ports/es.json index aea32821d..2fe527478 100644 --- a/etc/ncp-config.d/l10n/nc-forward-ports/es.json +++ b/etc/ncp-config.d/l10n/nc-forward-ports/es.json @@ -1,6 +1,6 @@ { "translations": { - "For NextCloudPi to be able to setup your ports, UPnP must be activated\nin your router. Activate it now on your router admin webpage.\n\n** UPnP is considered a security risk **\n\nDon't forget to disable it afterwards": "Para que NextCloudPi sea capaz de configurar tus puertos, UPnP debe estar activado\nen tu router. Actívalo ahora en la página de administración de tu router\n\n** UPnP se considera un riesgo de seguridad\n\nNo olvides deshabilitarlo más tarde", + "For NextcloudPi to be able to setup your ports, UPnP must be activated\nin your router. Activate it now on your router admin webpage.\n\n** UPnP is considered a security risk **\n\nDon't forget to disable it afterwards": "Para que NextcloudPi sea capaz de configurar tus puertos, UPnP debe estar activado\nen tu router. Actívalo ahora en la página de administración de tu router\n\n** UPnP se considera un riesgo de seguridad\n\nNo olvides deshabilitarlo más tarde", "HTTPPORT": "Puerto HTTP", "HTTPSPORT": "Puerto HTTPS", "Instructions for UPnP Port Forwarding": "Instrucciones para UPnP Port Forwarding", diff --git a/etc/ncp-config.d/l10n/nc-forward-ports/pt.json b/etc/ncp-config.d/l10n/nc-forward-ports/pt.json index 1230a8c64..5546701b1 100644 --- a/etc/ncp-config.d/l10n/nc-forward-ports/pt.json +++ b/etc/ncp-config.d/l10n/nc-forward-ports/pt.json @@ -1,6 +1,6 @@ { "translations": { - "For NextCloudPi to be able to setup your ports, UPnP must be activated\nin your router. Activate it now on your router admin webpage.\n\n** UPnP is considered a security risk **\n\nDon't forget to disable it afterwards": "Para o NextCloudPi conseguir configurar as portas, UPnp deve estar ativo\nno seu Roteador.A ativação é feita na pagina de Web administração do seu roteador\n\n**UPnP é considerado um risco de segurança**\n\nNão esqueça de desativá-lo depois.", + "For NextcloudPi to be able to setup your ports, UPnP must be activated\nin your router. Activate it now on your router admin webpage.\n\n** UPnP is considered a security risk **\n\nDon't forget to disable it afterwards": "Para o NextcloudPi conseguir configurar as portas, UPnp deve estar ativo\nno seu Roteador.A ativação é feita na pagina de Web administração do seu roteador\n\n**UPnP é considerado um risco de segurança**\n\nNão esqueça de desativá-lo depois.", "HTTPPORT": "Porta http", "HTTPSPORT": "Porta https", "nc-forward-ports": "nc-portas-encaminhadas (UPnP)", diff --git a/etc/ncp-config.d/l10n/nc-forward-ports/zh.json b/etc/ncp-config.d/l10n/nc-forward-ports/zh.json index 3d655309b..86a193590 100644 --- a/etc/ncp-config.d/l10n/nc-forward-ports/zh.json +++ b/etc/ncp-config.d/l10n/nc-forward-ports/zh.json @@ -1,6 +1,6 @@ { "translations": { - "For NextCloudPi to be able to setup your ports, UPnP must be activated\nin your router. Activate it now on your router admin webpage.\n\n** UPnP is considered a security risk **\n\nDon't forget to disable it afterwards": "如果要讓NextCloudPi自動設置您的Port，請在您的路由器開啟UPnP\n因鑒於安全性等問題，請在設定成功後關閉UPnP", + "For NextcloudPi to be able to setup your ports, UPnP must be activated\nin your router. Activate it now on your router admin webpage.\n\n** UPnP is considered a security risk **\n\nDon't forget to disable it afterwards": "如果要讓NextcloudPi自動設置您的Port，請在您的路由器開啟UPnP\n因鑒於安全性等問題，請在設定成功後關閉UPnP", "HTTPPORT": "http Port", "HTTPSPORT": "https Port", "nc-forward-ports": "端口轉發（UPnP）", diff --git a/etc/ncp-config.d/l10n/nc-import-ncp/es.json b/etc/ncp-config.d/l10n/nc-import-ncp/es.json index 75bcc2460..60c09dc69 100644 --- a/etc/ncp-config.d/l10n/nc-import-ncp/es.json +++ b/etc/ncp-config.d/l10n/nc-import-ncp/es.json @@ -1,7 +1,7 @@ { "translations": { "FILE": "Fichero", - "Import NextCloudPi configuration from file": "Importa la configuración de NextCloudPi desde un fichero", + "Import NextcloudPi configuration from file": "Importa la configuración de NextcloudPi desde un fichero", "nc-import-ncp": "nc-import-ncp" } } diff --git a/etc/ncp-config.d/l10n/nc-import-ncp/pt.json b/etc/ncp-config.d/l10n/nc-import-ncp/pt.json index c5bd896b8..a519f9fc4 100644 --- a/etc/ncp-config.d/l10n/nc-import-ncp/pt.json +++ b/etc/ncp-config.d/l10n/nc-import-ncp/pt.json @@ -1,7 +1,7 @@ { "translations": { "FILE": "Arquivo", - "Import NextCloudPi configuration from file": "Importar a configuração do NextCloudPi de um arquivo", + "Import NextcloudPi configuration from file": "Importar a configuração do NextcloudPi de um arquivo", "nc-import-ncp": "nc-importa-ncp" } } diff --git a/etc/ncp-config.d/l10n/nc-import-ncp/zh.json b/etc/ncp-config.d/l10n/nc-import-ncp/zh.json index 4d0e134af..7623f1355 100644 --- a/etc/ncp-config.d/l10n/nc-import-ncp/zh.json +++ b/etc/ncp-config.d/l10n/nc-import-ncp/zh.json @@ -1,7 +1,7 @@ { "translations": { "FILE": "檔案位置", - "Import NextCloudPi configuration from file": "匯入NextCloudPi設定", + "Import NextcloudPi configuration from file": "匯入NextcloudPi設定", "nc-import-ncp": "匯入NCP設定" } } diff --git a/etc/ncp-config.d/l10n/nc-info/es.json b/etc/ncp-config.d/l10n/nc-info/es.json index 6bfc55460..0ddd1ffcc 100644 --- a/etc/ncp-config.d/l10n/nc-info/es.json +++ b/etc/ncp-config.d/l10n/nc-info/es.json @@ -1,6 +1,6 @@ { "translations": { - "Print NextCloudPi system info": "Muestra información de sistema de NCP", + "Print NextcloudPi system info": "Muestra información de sistema de NCP", "nc-info": "nc-info" } } diff --git a/etc/ncp-config.d/l10n/nc-info/pt.json b/etc/ncp-config.d/l10n/nc-info/pt.json index e85a06f09..ecf3e824f 100644 --- a/etc/ncp-config.d/l10n/nc-info/pt.json +++ b/etc/ncp-config.d/l10n/nc-info/pt.json @@ -1,6 +1,6 @@ { "translations": { - "Print NextCloudPi system info": "Imprime informações do sistema NextCloudPi", + "Print NextcloudPi system info": "Imprime informações do sistema NextcloudPi", "nc-info": "nc-info" } } diff --git a/etc/ncp-config.d/l10n/nc-info/zh.json b/etc/ncp-config.d/l10n/nc-info/zh.json index fd3fea2c4..12ce80a34 100644 --- a/etc/ncp-config.d/l10n/nc-info/zh.json +++ b/etc/ncp-config.d/l10n/nc-info/zh.json @@ -1,6 +1,6 @@ { "translations": { - "Print NextCloudPi system info": "顯示NextCloudPi系統信息", + "Print NextcloudPi system info": "顯示NextcloudPi系統信息", "nc-info": "NCP系統訊息" } } diff --git a/etc/ncp-config.d/l10n/nc-init/zh.json b/etc/ncp-config.d/l10n/nc-init/zh.json index 8e3e2e2a1..4b8c5c40f 100644 --- a/etc/ncp-config.d/l10n/nc-init/zh.json +++ b/etc/ncp-config.d/l10n/nc-init/zh.json @@ -1,7 +1,7 @@ { "translations":{ "(Re)initiate Nextcloud to a clean configuration":"初始化Nextcloud", - "This action will configure NextCloud to NextCloudPi defaults.\n\n** YOUR CONFIGURATION WILL BE LOST **\n\n":"重設後將使用預設文件配置(NextcloudPi)\n**您所有的資料及設定將會刪除並無法復原**", + "This action will configure NextCloud to NextcloudPi defaults.\n\n** YOUR CONFIGURATION WILL BE LOST **\n\n":"重設後將使用預設文件配置(NextcloudPi)\n**您所有的資料及設定將會刪除並無法復原**", "ADMINUSER":"管理員", "ADMINPASS":"管理員密碼", "nc-init":"初始化NC" diff --git a/etc/ncp-config.d/l10n/nc-limits/es.json b/etc/ncp-config.d/l10n/nc-limits/es.json index ddf6529c5..33709c310 100644 --- a/etc/ncp-config.d/l10n/nc-limits/es.json +++ b/etc/ncp-config.d/l10n/nc-limits/es.json @@ -1,6 +1,6 @@ { "translations": { - "Configure system limits for NextCloudPi": "Configura los límites de sistema para NextCloudPi", + "Configure system limits for NextcloudPi": "Configura los límites de sistema para NextcloudPi", "MAXFILESIZE":"Tamaño máximo de archivo en subida", "MEMORYLIMIT": "Límite de memoria", "PHPTHREADS": "Hilos PHP", diff --git a/etc/ncp-config.d/l10n/nc-limits/pt.json b/etc/ncp-config.d/l10n/nc-limits/pt.json index fe3eae510..f498f26e8 100644 --- a/etc/ncp-config.d/l10n/nc-limits/pt.json +++ b/etc/ncp-config.d/l10n/nc-limits/pt.json @@ -1,6 +1,6 @@ { "translations": { - "Configure system limits for NextCloudPi": "Configura os limites de sistema para NextCloudPi", + "Configure system limits for NextcloudPi": "Configura os limites de sistema para NextcloudPi", "MAXFILESIZE":"Tamanho máximo de arquivo para upload", "MEMORYLIMIT": "Limite de memória", "PHPTHREADS": "THREADS PHP", diff --git a/etc/ncp-config.d/l10n/nc-limits/zh.json b/etc/ncp-config.d/l10n/nc-limits/zh.json index 3a9a187d0..a3d59b87a 100644 --- a/etc/ncp-config.d/l10n/nc-limits/zh.json +++ b/etc/ncp-config.d/l10n/nc-limits/zh.json @@ -1,6 +1,6 @@ { "translations": { - "Configure system limits for NextCloudPi": "設定NextCloudPi的系統限制", + "Configure system limits for NextcloudPi": "設定NextcloudPi的系統限制", "MAXFILESIZE": "最大文件大小（<=2G）", "MEMORYLIMIT": "內存限制", "PHPTHREADS": "PHP線程", diff --git a/etc/ncp-config.d/l10n/nc-nextcloud/pt.json b/etc/ncp-config.d/l10n/nc-nextcloud/pt.json index c6234a142..94b77eeb4 100644 --- a/etc/ncp-config.d/l10n/nc-nextcloud/pt.json +++ b/etc/ncp-config.d/l10n/nc-nextcloud/pt.json @@ -6,7 +6,7 @@ "MEMORYLIMIT":"Limíte de Memória", "MAXTRANSFERTIME":"Tempo máximo de transferência", "NextCloud installation":"Instalação NextCloud", - "This new installation will cleanup current\nNextCloud instance, including files and database.\n\nYou can later use nc-init to configure to NextCloudPi defaults\n\n** perform backup before proceding **\n\nYou can use nc-backup ":"Esta nova instalação irá apagar a instância atual\ndo NextCloud, incluindo os arquivos e o Banco de Dados.\nVocê depois pode usar o nc-init para configurar os padrões do NextCloudPi\n\n**Realize Backup antes de Continuar**\n\nVocê pode usar o nc-backup", + "This new installation will cleanup current\nNextCloud instance, including files and database.\n\nYou can later use nc-init to configure to NextcloudPi defaults\n\n** perform backup before proceding **\n\nYou can use nc-backup ":"Esta nova instalação irá apagar a instância atual\ndo NextCloud, incluindo os arquivos e o Banco de Dados.\nVocê depois pode usar o nc-init para configurar os padrões do NextcloudPi\n\n**Realize Backup antes de Continuar**\n\nVocê pode usar o nc-backup", "nc-nextcloud":"nc-nextcloud", "Install any NextCloud version":"Instalar qualquer versão NextCloud" } diff --git a/etc/ncp-config.d/l10n/nc-nextcloud/zh.json b/etc/ncp-config.d/l10n/nc-nextcloud/zh.json index 373ade49b..f5a2a0cec 100644 --- a/etc/ncp-config.d/l10n/nc-nextcloud/zh.json +++ b/etc/ncp-config.d/l10n/nc-nextcloud/zh.json @@ -6,7 +6,7 @@ "MEMORYLIMIT":"記憶體限制", "MAXTRANSFERTIME":"最大傳輸時間", "NextCloud installation":"重新下載安裝NextCloud", - "This new installation will cleanup current\nNextCloud instance, including files and database.\n\nYou can later use nc-init to configure to NextCloudPi defaults\n\n** perform backup before proceding **\n\nYou can use nc-backup ":"這個動作安裝將清理目前NextCloud的所有內容，所有的文件及數據庫都將會被刪除\n安裝完後您可以使用初始化NextCloud來快速設定回系統默認值以及資料庫\n或者您可以在開始動作前先進行備份(NC備份)", + "This new installation will cleanup current\nNextCloud instance, including files and database.\n\nYou can later use nc-init to configure to NextcloudPi defaults\n\n** perform backup before proceding **\n\nYou can use nc-backup ":"這個動作安裝將清理目前NextCloud的所有內容，所有的文件及數據庫都將會被刪除\n安裝完後您可以使用初始化NextCloud來快速設定回系統默認值以及資料庫\n或者您可以在開始動作前先進行備份(NC備份)", "nc-nextcloud":"重新安裝NC", "Install any NextCloud version":"下載安裝NextCloud" } diff --git a/etc/ncp-config.d/l10n/nc-notify-updates/pt.json b/etc/ncp-config.d/l10n/nc-notify-updates/pt.json index 0e9bbd100..8b00ebc39 100644 --- a/etc/ncp-config.d/l10n/nc-notify-updates/pt.json +++ b/etc/ncp-config.d/l10n/nc-notify-updates/pt.json @@ -2,7 +2,7 @@ "translations":{ "ACTIVE":"Ativo", "USER":"Usuário", - "Notify in NC when a NextCloudPi update is available":"Notifica no NC quando uma atualização NextCloudPi está disponível", + "Notify in NC when a NextcloudPi update is available":"Notifica no NC quando uma atualização NextcloudPi está disponível", "nc-notify-updates":"nc-notificar-atualizações" } } diff --git a/etc/ncp-config.d/l10n/nc-notify-updates/zh.json b/etc/ncp-config.d/l10n/nc-notify-updates/zh.json index 3b7402c8e..199c2ebb1 100644 --- a/etc/ncp-config.d/l10n/nc-notify-updates/zh.json +++ b/etc/ncp-config.d/l10n/nc-notify-updates/zh.json @@ -2,7 +2,7 @@ "translations":{ "ACTIVE":"開啟", "USER":"使用者", - "Notify in NC when a NextCloudPi update is available":"在NextcloudPi需要更新時在Nextcloud通知您", + "Notify in NC when a NextcloudPi update is available":"在NextcloudPi需要更新時在Nextcloud通知您", "nc-notify-updates":"NCP更新通知" } } diff --git a/etc/ncp-config.d/l10n/nc-passwd/es.json b/etc/ncp-config.d/l10n/nc-passwd/es.json index f0b73aa23..8cdd597c5 100644 --- a/etc/ncp-config.d/l10n/nc-passwd/es.json +++ b/etc/ncp-config.d/l10n/nc-passwd/es.json @@ -1,7 +1,7 @@ { "translations": { "CONFIRM": "Confirmar", - "Change password for the NextCloudPi Panel": "Cambiar la contraseña para el Panel de NextCloudPi", + "Change password for the NextcloudPi Panel": "Cambiar la contraseña para el Panel de NextcloudPi", "PASSWORD": "Contraseña", "nc-passwd": "nc-passwd" } diff --git a/etc/ncp-config.d/l10n/nc-passwd/pt.json b/etc/ncp-config.d/l10n/nc-passwd/pt.json index 473921fe0..f4b836105 100644 --- a/etc/ncp-config.d/l10n/nc-passwd/pt.json +++ b/etc/ncp-config.d/l10n/nc-passwd/pt.json @@ -1,6 +1,6 @@ { "translations":{ - "Change password for the NextCloudPi Panel":"Mudar a senha para o painel NextCloudPi", + "Change password for the NextcloudPi Panel":"Mudar a senha para o painel NextcloudPi", "nc-passwd":"nc-senha", "PASSWORD":"Senha", "CONFIRM":"Confirmar" diff --git a/etc/ncp-config.d/l10n/nc-passwd/zh.json b/etc/ncp-config.d/l10n/nc-passwd/zh.json index 57d526f4a..f9b609b2d 100644 --- a/etc/ncp-config.d/l10n/nc-passwd/zh.json +++ b/etc/ncp-config.d/l10n/nc-passwd/zh.json @@ -1,6 +1,6 @@ { "translations":{ - "Change password for the NextCloudPi Panel":"修改NextCloudPi網頁介面的密碼", + "Change password for the NextcloudPi Panel":"修改NextcloudPi網頁介面的密碼", "nc-passwd":"修改NCP密碼", "PASSWORD":"密碼", "CONFIRM":"再次輸入密碼" diff --git a/etc/ncp-config.d/l10n/nc-update/pt.json b/etc/ncp-config.d/l10n/nc-update/pt.json index 16c563b7c..d4d313f2d 100644 --- a/etc/ncp-config.d/l10n/nc-update/pt.json +++ b/etc/ncp-config.d/l10n/nc-update/pt.json @@ -1,6 +1,6 @@ { "translations":{ - "Update NextCloudPi":"atualização NextCloudPi", + "Update NextcloudPi":"atualização NextcloudPi", "nc-update":"nc-atualização" } } diff --git a/etc/ncp-config.d/l10n/nc-update/zh.json b/etc/ncp-config.d/l10n/nc-update/zh.json index da24955f7..ed52b2d00 100644 --- a/etc/ncp-config.d/l10n/nc-update/zh.json +++ b/etc/ncp-config.d/l10n/nc-update/zh.json @@ -1,6 +1,6 @@ { "translations":{ - "Update NextCloudPi":"更新NextCloudPi", + "Update NextcloudPi":"更新NextcloudPi", "nc-update":"更新NCP" } } diff --git a/etc/ncp-config.d/nc-autoupdate-ncp.cfg b/etc/ncp-config.d/nc-autoupdate-ncp.cfg index 80d2e77e6..2b6ffb1b1 100644 --- a/etc/ncp-config.d/nc-autoupdate-ncp.cfg +++ b/etc/ncp-config.d/nc-autoupdate-ncp.cfg @@ -2,7 +2,7 @@ "id": "nc-autoupdate-ncp", "name": "Nc-autoupdate-ncp", "title": "nc-autoupdate-ncp", - "description": "Automatically apply NextCloudPi updates", + "description": "Automatically apply NextcloudPi updates", "info": "", "infotitle": "", "params": [ diff --git a/etc/ncp-config.d/nc-export-ncp.cfg b/etc/ncp-config.d/nc-export-ncp.cfg index 105824d64..59292531c 100644 --- a/etc/ncp-config.d/nc-export-ncp.cfg +++ b/etc/ncp-config.d/nc-export-ncp.cfg @@ -2,7 +2,7 @@ "id": "nc-export-ncp", "name": "Nc-export-ncp", "title": "nc-export-ncp", - "description": "Export NextCloudPi configuration", + "description": "Export NextcloudPi configuration", "info": "", "infotitle": "", "params": [ diff --git a/etc/ncp-config.d/nc-forward-ports.cfg b/etc/ncp-config.d/nc-forward-ports.cfg index 7d285bb79..08fe16433 100644 --- a/etc/ncp-config.d/nc-forward-ports.cfg +++ b/etc/ncp-config.d/nc-forward-ports.cfg @@ -3,7 +3,7 @@ "name": "Nc-forward-ports", "title": "nc-forward-ports", "description": "Set port forwarding to access from outside", - "info": "For NextCloudPi to be able to setup your ports, UPnP must be activated\nin your router. Activate it now on your router admin webpage.\n\n** UPnP is considered a security risk **\n\nDon't forget to disable it afterwards", + "info": "For NextcloudPi to be able to setup your ports, UPnP must be activated\nin your router. Activate it now on your router admin webpage.\n\n** UPnP is considered a security risk **\n\nDon't forget to disable it afterwards", "infotitle": "Instructions for UPnP Port Forwarding", "params": [ { diff --git a/etc/ncp-config.d/nc-import-ncp.cfg b/etc/ncp-config.d/nc-import-ncp.cfg index 05ac89707..1ad9c6b0c 100644 --- a/etc/ncp-config.d/nc-import-ncp.cfg +++ b/etc/ncp-config.d/nc-import-ncp.cfg @@ -2,7 +2,7 @@ "id": "nc-import-ncp", "name": "Nc-import-ncp", "title": "nc-import-ncp", - "description": "Import NextCloudPi configuration from file", + "description": "Import NextcloudPi configuration from file", "info": "", "infotitle": "", "params": [ diff --git a/etc/ncp-config.d/nc-info.cfg b/etc/ncp-config.d/nc-info.cfg index 8193350a0..5303a95d0 100644 --- a/etc/ncp-config.d/nc-info.cfg +++ b/etc/ncp-config.d/nc-info.cfg @@ -2,7 +2,7 @@ "id": "nc-info", "name": "Nc-info", "title": "nc-info", - "description": "Print NextCloudPi system info", + "description": "Print NextcloudPi system info", "info": "", "infotitle": "", "params": [] diff --git a/etc/ncp-config.d/nc-init.cfg b/etc/ncp-config.d/nc-init.cfg index 0adc1a4a8..1e60932fa 100644 --- a/etc/ncp-config.d/nc-init.cfg +++ b/etc/ncp-config.d/nc-init.cfg @@ -3,7 +3,7 @@ "name": "Nc-init", "title": "nc-init", "description": "(Re)initiate Nextcloud to a clean configuration", - "info": "This action will configure NextCloud to NextCloudPi defaults.\n\n** YOUR CONFIGURATION WILL BE LOST **\n\n", + "info": "This action will configure NextCloud to NextcloudPi defaults.\n\n** YOUR CONFIGURATION WILL BE LOST **\n\n", "infotitle": "Clean NextCloud configuration", "params": [ { diff --git a/etc/ncp-config.d/nc-limits.cfg b/etc/ncp-config.d/nc-limits.cfg index eb31282bb..705d143b1 100644 --- a/etc/ncp-config.d/nc-limits.cfg +++ b/etc/ncp-config.d/nc-limits.cfg @@ -2,7 +2,7 @@ "id": "nc-limits", "name": "Nc-limits", "title": "nc-limits", - "description": "Configure system limits for NextCloudPi", + "description": "Configure system limits for NextcloudPi", "info": "Examples: 200M or 2G. Write 0 for autoconfig", "infotitle": "", "params": [ diff --git a/etc/ncp-config.d/nc-notify-updates.cfg b/etc/ncp-config.d/nc-notify-updates.cfg index 3f02f5b2a..3f17b773e 100644 --- a/etc/ncp-config.d/nc-notify-updates.cfg +++ b/etc/ncp-config.d/nc-notify-updates.cfg @@ -2,7 +2,7 @@ "id": "nc-notify-updates", "name": "Nc-notify-updates", "title": "nc-notify-updates", - "description": "Notify in Nextcloud when a NextCloudPi update is available", + "description": "Notify in Nextcloud when a NextcloudPi update is available", "info": "", "infotitle": "", "params": [ diff --git a/etc/ncp-config.d/nc-passwd.cfg b/etc/ncp-config.d/nc-passwd.cfg index 36d4b42ab..9173bb1fe 100644 --- a/etc/ncp-config.d/nc-passwd.cfg +++ b/etc/ncp-config.d/nc-passwd.cfg @@ -2,7 +2,7 @@ "id": "nc-passwd", "name": "Nc-passwd", "title": "nc-passwd", - "description": "Change password for the NextCloudPi Panel", + "description": "Change password for the NextcloudPi Panel", "info": "Please note some special characters are not allowed here, avoid using ) } ; # in password", "infotitle": "", "params": [ diff --git a/etc/ncp-config.d/nc-update.cfg b/etc/ncp-config.d/nc-update.cfg index 987951b5b..15d5bd654 100644 --- a/etc/ncp-config.d/nc-update.cfg +++ b/etc/ncp-config.d/nc-update.cfg @@ -2,7 +2,7 @@ "id": "nc-update", "name": "Nc-update", "title": "nc-update", - "description": "Update NextCloudPi", + "description": "Update NextcloudPi", "info": "", "infotitle": "", "params": [] diff --git a/i18n/README-zh_CN.md b/i18n/README-zh_CN.md index 6b48e8721..26cb1676c 100644 --- a/i18n/README-zh_CN.md +++ b/i18n/README-zh_CN.md @@ -1,13 +1,13 @@ [English](/README.md) | [Traditional Chinese 繁體中文](README-zh_TW.md) | Simplified Chinese 简体中文 -# NextCloudPi [![chatroom icon](https://patrolavia.github.io/telegram-badge/chat.png)](https://t.me/NextCloudPi) [![forums icon](https://img.shields.io/badge/help-forums-blue.svg)](https://help.nextcloud.com/c/support/appliances-docker-snappy-vm) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=N8PJHSEQF4G7Y&lc=US&item_name=Own%20Your%20Bits&item_number=NextCloudPi&no_note=1&no_shipping=1¤cy_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted) [![blog](https://img.shields.io/badge/follow-blog-orange.svg)](https://ownyourbits.com) +# NextcloudPi [![chatroom icon](https://patrolavia.github.io/telegram-badge/chat.png)](https://t.me/NextCloudPi) [![forums icon](https://img.shields.io/badge/help-forums-blue.svg)](https://help.nextcloud.com/c/support/appliances-docker-snappy-vm) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=N8PJHSEQF4G7Y&lc=US&item_name=Own%20Your%20Bits&item_number=NextCloudPi&no_note=1&no_shipping=1¤cy_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted) [![blog](https://img.shields.io/badge/follow-blog-orange.svg)](https://ownyourbits.com) ![NC Logo](https://ownyourbits.com/wp-content/uploads/2017/11/ncp-square.png) -这里是用来构建 [NextCloudPi](https://nextcloudpi.com) 的代码。 +这里是用来构建 [NextcloudPi](https://nextcloudpi.com) 的代码。 -NextCloudPi 是一款适用于 Raspberry Pi、Odroid HC1、rock64 等其他板卡的现成镜像。 +NextcloudPi 是一款适用于 Raspberry Pi、Odroid HC1、rock64 等其他板卡的现成镜像。 这个代码也可以用来生成 [ARM](https://hub.docker.com/r/ownyourbits/nextcloudpi-armhf) 和 [x86](https://hub.docker.com/r/ownyourbits/nextcloudpi-x86) 平台的 docker 镜像，并且包含一个适用于任何基于 Debian 系统的安装程序。 @@ -35,7 +35,7 @@ NextCloudPi 是一款适用于 Raspberry Pi、Odroid HC1、rock64 等其他板 ## 额外之处 * 安装向导 - * NextCloudPi Web 面板 + * NextcloudPi Web 面板 * 已准备好的 Wi-Fi * RAM 日志 * 自动安装安全更新，默认激活 @@ -52,7 +52,7 @@ NextCloudPi 是一款适用于 Raspberry Pi、Odroid HC1、rock64 等其他板 * 通过预装的 SAMBA 与 Windows/Mac/Linux 分享文件 * 自动挂载 USB * 远程更新 - * 自动更新 NextCloudPi + * 自动更新 NextcloudPi * 自动更新 NextCloud * 更新通知 * NextCloud 备份和恢复 @@ -113,7 +113,7 @@ cd nextcloudpi ./build-docker.sh arm64 ``` -NextCloudPi 可以被安装在任何架构的最新版本 Debian 系统上 +NextcloudPi 可以被安装在任何架构的最新版本 Debian 系统上 ``` # curl -sSL https://raw.githubusercontent.com/nextcloud/nextcloudpi/master/install.sh | bash diff --git a/i18n/README-zh_TW.md b/i18n/README-zh_TW.md index f906f2d61..8d14b28f3 100644 --- a/i18n/README-zh_TW.md +++ b/i18n/README-zh_TW.md @@ -1,14 +1,14 @@ [English](/README.md) | Traditional Chinese 繁體中文 | [Simplified Chinese 简体中文](README-zh_CN.md) -# NextCloudPi [![chatroom icon](https://patrolavia.github.io/telegram-badge/chat.png)](https://t.me/NextCloudPi) [![forums icon](https://img.shields.io/badge/help-forums-blue.svg)](https://help.nextcloud.com/c/support/appliances-docker-snappy-vm) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=N8PJHSEQF4G7Y&lc=US&item_name=Own%20Your%20Bits&item_number=NextCloudPi&no_note=1&no_shipping=1¤cy_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted) [![blog](https://img.shields.io/badge/follow-blog-orange.svg)](https://ownyourbits.com) +# NextcloudPi [![chatroom icon](https://patrolavia.github.io/telegram-badge/chat.png)](https://t.me/NextCloudPi) [![forums icon](https://img.shields.io/badge/help-forums-blue.svg)](https://help.nextcloud.com/c/support/appliances-docker-snappy-vm) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=N8PJHSEQF4G7Y&lc=US&item_name=Own%20Your%20Bits&item_number=NextCloudPi&no_note=1&no_shipping=1¤cy_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted) [![blog](https://img.shields.io/badge/follow-blog-orange.svg)](https://ownyourbits.com) ![NC Logo](https://ownyourbits.com/wp-content/uploads/2017/11/ncp-square.png) -歡迎來到 [NextCloudPi](https://nextcloudpi.com)！ +歡迎來到 [NextcloudPi](https://nextcloudpi.com)！ -NextCloudPi 是專門為 Raspberry Pi、Odroid HC1、rock64 以及其它單板電腦所製作的映象檔。 +NextcloudPi 是專門為 Raspberry Pi、Odroid HC1、rock64 以及其它單板電腦所製作的映象檔。 為了方便使用者簡單地安裝 NextCloud 所製作。 @@ -40,7 +40,7 @@ NextCloudPi 是專門為 Raspberry Pi、Odroid HC1、rock64 以及其它單板 ## 特別之處 * 首次安裝導覽頁面 - * NextCloudPi 網路 面板 + * NextcloudPi 網路 面板 * 可使用 Wi-Fi * Ram logs * 自動安裝安全更新，且預設如此。 @@ -58,7 +58,7 @@ NextCloudPi 是專門為 Raspberry Pi、Odroid HC1、rock64 以及其它單板 * SAMBA ready to share your files with Windows/Mac/Linux * USB 自動掛載 * 遠端更新 - * 自動更新 NextCloudPi + * 自動更新 NextcloudPi * 自動更新 Nextcloud * 更新通知 * NextCloud 備份、復原備份 @@ -113,7 +113,7 @@ cd nextcloudpi ./build-docker.sh arm64 ``` -NextCloudPi 可以安裝在運行最新的 debian 的任何體系結構中 +NextcloudPi 可以安裝在運行最新的 debian 的任何體系結構中 ``` # curl -sSL https://raw.githubusercontent.com/nextcloud/nextcloudpi/master/install.sh | bash diff --git a/install.sh b/install.sh index b7a459798..ce1a66657 100644 --- a/install.sh +++ b/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -# NextCloudPi installation script +# NextcloudPi installation script # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! @@ -41,7 +41,7 @@ fi cd "${CODE_DIR}" # install NCP -echo -e "\nInstalling NextCloudPi..." +echo -e "\nInstalling NextcloudPi..." source etc/library.sh # check distro diff --git a/ncp-activation/CSS.css b/ncp-activation/CSS.css index 2cb5638e7..0cc4f6bf3 100644 --- a/ncp-activation/CSS.css +++ b/ncp-activation/CSS.css @@ -1,5 +1,5 @@ -/* - * NextCloudPi Web Panel style sheets. Based on official Nextcloud 12 datasheets +/* + * NextcloudPi Web Panel style sheets. Based on official Nextcloud 12 datasheets * * Copyleft 2018 by Ignacio Nunez Hernanz * GPL licensed (see end of file) * Use at your own risk! diff --git a/ncp-activation/JS.js b/ncp-activation/JS.js index 3432dbe17..7b1bce89b 100644 --- a/ncp-activation/JS.js +++ b/ncp-activation/JS.js @@ -1,5 +1,5 @@ /// -// NextCloudPi Web Panel javascript library +// NextcloudPi Web Panel javascript library // // Copyleft 2017 by Ignacio Nunez Hernanz // GPL licensed (see end of file) * Use at your own risk! @@ -13,8 +13,8 @@ var selectedID = null; var confLock = false; function errorMsg() -{ - $('#error-box').fill( "Something went wrong. Try refreshing the page" ); +{ + $('#error-box').fill( "Something went wrong. Try refreshing the page" ); } function launch_nc_passwd() @@ -31,20 +31,20 @@ function launch_nc_passwd() var ret = $.parseJSON( result ); if ( ret.ret == '0' ) { - setTimeout( function(){ + setTimeout( function(){ $('#loading-gif').hide(); - $('#error-box').fill( "ACTIVATION SUCCESSFUL" ); + $('#error-box').fill( "ACTIVATION SUCCESSFUL" ); var url = window.location.protocol + '//' + window.location.hostname + ':4443'; if ( !window.open( url, '_blank' ) ) // try to open in a new tab first window.location.replace( url ); }, 4000 ); } else { - $('#error-box').fill( "nc-passwd error" ); + $('#error-box').fill( "nc-passwd error" ); } } ).error( errorMsg ); } -function nc_admin_ok_cb( result ) +function nc_admin_ok_cb( result ) { var ret = $.parseJSON( result ); if ( ret.token ) @@ -52,7 +52,7 @@ function nc_admin_ok_cb( result ) if ( ret.ret == '0' ) { launch_nc_passwd(); } else { - $('#error-box').fill( "NextCloudPi not yet initialized, trying again in a few seconds ..." ); + $('#error-box').fill( "NextcloudPi not yet initialized, trying again in a few seconds ..." ); setTimeout( launch_activation, 10000 ); } } @@ -61,15 +61,15 @@ function launch_activation() { // request $.request('post', '../ncp-launcher.php', { action: 'launch', - ref : 'nc-admin', + ref : 'nc-admin', config: '{ "PASSWORD":"' + $('#nc-pwd').get('.value') + '",' + '"CONFIRM" :"' + $('#nc-pwd').get('.value') + '",' + '"USER" : "ncp" }', - csrf_token: $( '#csrf-token' ).get( '.value' ) } + csrf_token: $( '#csrf-token' ).get( '.value' ) } ).then( nc_admin_ok_cb ).error( errorMsg ); } -$(function() +$(function() { // print info page $( '#print-pwd' ).on( 'click', function(e) { window.print(); } ); @@ -96,7 +96,7 @@ $(function() input.selectionStart = input.selectionEnd; } ); - // activate NextCloudPi + // activate NextcloudPi $( '#activate-ncp' ).on( 'click', function(e) { $( '#activate-ncp' ).hide(); diff --git a/ncp-activation/index.php b/ncp-activation/index.php index 8b2d901cf..a841dc729 100644 --- a/ncp-activation/index.php +++ b/ncp-activation/index.php @@ -4,7 +4,7 @@ - NextCloudPi Activation + NextcloudPi Activation @@ -29,13 +29,13 @@ $nc_pwd = rtrim( base64_encode( random_bytes(32) ) , '=' ); // remove last '='. Remove rtrim in the future $ncp_pwd = rtrim( base64_encode( random_bytes(32) ) , '=' ); // remove last '='. Remove rtrim in the future echo <<NextCloudPi Activation -

Your NextCloudPi user is

-

Your NextCloudPi password is

   -

Save this password in order to access to the NextCloudPi web interface at https://nextcloudpi.local:4443

+

NextcloudPi Activation

+

Your NextcloudPi user is

+

Your NextcloudPi password is

   +

Save this password in order to access to the NextcloudPi web interface at https://nextcloudpi.local:4443

This password can be changed using 'nc-passwd'

-

Your NextCloud user is

+

Your Nextcloud user is

Your Nextcloud password is

  

Save this password in order to access NextCloud https://nextcloudpi.local

This password can be changed from the Nextcloud user configuration

@@ -55,7 +55,7 @@ nextcloudpi - NextCloudPi + NextcloudPi Nextcloud management tools - + 0.0.1 agpl nachoparker - NextCloudPi + NextcloudPi tools https://github.com/nextcloud/nextcloudpi/issues @@ -16,7 +16,7 @@ - NextCloudPi + NextcloudPi nextcloudpi.page.index diff --git a/ncp-app/appinfo/routes.php b/ncp-app/appinfo/routes.php index 13079dd21..c9dcaac67 100644 --- a/ncp-app/appinfo/routes.php +++ b/ncp-app/appinfo/routes.php @@ -2,7 +2,7 @@ /** * Create your routes in here. The name is the lowercase name of the controller * without the controller part, the stuff after the hash is the method. - * e.g. page#index -> OCA\NextCloudPi\Controller\PageController->index() + * e.g. page#index -> OCA\NextcloudPi\Controller\PageController->index() * * The controller class has to be registered in the application.php file since * it's instantiated in there diff --git a/ncp-app/lib/Controller/PageController.php b/ncp-app/lib/Controller/PageController.php index 088226313..ce1f11940 100644 --- a/ncp-app/lib/Controller/PageController.php +++ b/ncp-app/lib/Controller/PageController.php @@ -1,5 +1,5 @@
- Opening NextCloudPi Web Panel ... + Opening NextcloudPi Web Panel ...
diff --git a/ncp-web/activate/CSS.css b/ncp-web/activate/CSS.css index 2cb5638e7..0cc4f6bf3 100644 --- a/ncp-web/activate/CSS.css +++ b/ncp-web/activate/CSS.css @@ -1,5 +1,5 @@ -/* - * NextCloudPi Web Panel style sheets. Based on official Nextcloud 12 datasheets +/* + * NextcloudPi Web Panel style sheets. Based on official Nextcloud 12 datasheets * * Copyleft 2018 by Ignacio Nunez Hernanz * GPL licensed (see end of file) * Use at your own risk! diff --git a/ncp-web/activate/JS.js b/ncp-web/activate/JS.js index 3432dbe17..7b1bce89b 100644 --- a/ncp-web/activate/JS.js +++ b/ncp-web/activate/JS.js @@ -1,5 +1,5 @@ /// -// NextCloudPi Web Panel javascript library +// NextcloudPi Web Panel javascript library // // Copyleft 2017 by Ignacio Nunez Hernanz // GPL licensed (see end of file) * Use at your own risk! @@ -13,8 +13,8 @@ var selectedID = null; var confLock = false; function errorMsg() -{ - $('#error-box').fill( "Something went wrong. Try refreshing the page" ); +{ + $('#error-box').fill( "Something went wrong. Try refreshing the page" ); } function launch_nc_passwd() @@ -31,20 +31,20 @@ function launch_nc_passwd() var ret = $.parseJSON( result ); if ( ret.ret == '0' ) { - setTimeout( function(){ + setTimeout( function(){ $('#loading-gif').hide(); - $('#error-box').fill( "ACTIVATION SUCCESSFUL" ); + $('#error-box').fill( "ACTIVATION SUCCESSFUL" ); var url = window.location.protocol + '//' + window.location.hostname + ':4443'; if ( !window.open( url, '_blank' ) ) // try to open in a new tab first window.location.replace( url ); }, 4000 ); } else { - $('#error-box').fill( "nc-passwd error" ); + $('#error-box').fill( "nc-passwd error" ); } } ).error( errorMsg ); } -function nc_admin_ok_cb( result ) +function nc_admin_ok_cb( result ) { var ret = $.parseJSON( result ); if ( ret.token ) @@ -52,7 +52,7 @@ function nc_admin_ok_cb( result ) if ( ret.ret == '0' ) { launch_nc_passwd(); } else { - $('#error-box').fill( "NextCloudPi not yet initialized, trying again in a few seconds ..." ); + $('#error-box').fill( "NextcloudPi not yet initialized, trying again in a few seconds ..." ); setTimeout( launch_activation, 10000 ); } } @@ -61,15 +61,15 @@ function launch_activation() { // request $.request('post', '../ncp-launcher.php', { action: 'launch', - ref : 'nc-admin', + ref : 'nc-admin', config: '{ "PASSWORD":"' + $('#nc-pwd').get('.value') + '",' + '"CONFIRM" :"' + $('#nc-pwd').get('.value') + '",' + '"USER" : "ncp" }', - csrf_token: $( '#csrf-token' ).get( '.value' ) } + csrf_token: $( '#csrf-token' ).get( '.value' ) } ).then( nc_admin_ok_cb ).error( errorMsg ); } -$(function() +$(function() { // print info page $( '#print-pwd' ).on( 'click', function(e) { window.print(); } ); @@ -96,7 +96,7 @@ $(function() input.selectionStart = input.selectionEnd; } ); - // activate NextCloudPi + // activate NextcloudPi $( '#activate-ncp' ).on( 'click', function(e) { $( '#activate-ncp' ).hide(); diff --git a/ncp-web/activate/index.php b/ncp-web/activate/index.php index b983b8d7f..cdbe5a0e9 100644 --- a/ncp-web/activate/index.php +++ b/ncp-web/activate/index.php @@ -26,7 +26,7 @@ - NextCloudPi Activation + NextcloudPi Activation @@ -51,13 +51,13 @@ $nc_pwd = rtrim( base64_encode( random_bytes(32) ) , '=' ); // remove last '='. Remove rtrim in the future $ncp_pwd = rtrim( base64_encode( random_bytes(32) ) , '=' ); // remove last '='. Remove rtrim in the future echo <<NextCloudPi Activation -

Your NextCloudPi user is

-

Your NextCloudPi password is

   -

Save this password in order to access to the NextCloudPi web interface at https://nextcloudpi.local:4443

+

NextcloudPi Activation

+

Your NextcloudPi user is

+

Your NextcloudPi password is

   +

Save this password in order to access to the NextcloudPi web interface at https://nextcloudpi.local:4443

This password can be changed using 'nc-passwd'

-

Your NextCloud user is

+

Your Nextcloud user is

Your Nextcloud password is

  

Save this password in order to access NextCloud https://nextcloudpi.local

This password can be changed from the Nextcloud user configuration

@@ -77,7 +77,7 @@ GPL licensed (see end of file) * Use at your own risk! diff --git a/ncp-web/csrf.php b/ncp-web/csrf.php index 34d0fc03f..9fd100e2e 100644 --- a/ncp-web/csrf.php +++ b/ncp-web/csrf.php @@ -1,6 +1,6 @@ * GPL licensed (see end of file) * Use at your own risk! diff --git a/ncp-web/decrypt/CSS.css b/ncp-web/decrypt/CSS.css index a687c9be5..b68983e11 100644 --- a/ncp-web/decrypt/CSS.css +++ b/ncp-web/decrypt/CSS.css @@ -1,5 +1,5 @@ -/* - * NextCloudPi Web Panel style sheets. Based on official Nextcloud 12 datasheets +/* + * NextcloudPi Web Panel style sheets. Based on official Nextcloud 12 datasheets * * Copyleft 2018 by Ignacio Nunez Hernanz * GPL licensed (see end of file) * Use at your own risk! diff --git a/ncp-web/decrypt/JS.js b/ncp-web/decrypt/JS.js index 91d6149c1..f670c90c9 100644 --- a/ncp-web/decrypt/JS.js +++ b/ncp-web/decrypt/JS.js @@ -1,5 +1,5 @@ /// -// NextCloudPi Web Panel javascript library +// NextcloudPi Web Panel javascript library // // Copyleft 2017 by Ignacio Nunez Hernanz // GPL licensed (see end of file) * Use at your own risk! @@ -11,22 +11,22 @@ var MINI = require('minified'); var $ = MINI.$, $$ = MINI.$$, EE = MINI.EE; function errorMsg() -{ - $('#error-box').fill("Something went wrong. Try refreshing the page"); +{ + $('#error-box').fill("Something went wrong. Try refreshing the page"); } -function decrypt_ok_cb(result) +function decrypt_ok_cb(result) { var ret = $.parseJSON(result); $('#loading-gif').hide(); if ( ret.token ) $('#csrf-token').set( { value: ret.token } ); if ( ret.ret == '0' ) { - $('#error-box').fill("OK"); + $('#error-box').fill("OK"); var url = window.location.protocol + '//' + window.location.hostname; window.location.replace( url ); } else { - $('#error-box').fill("Password error"); + $('#error-box').fill("Password error"); $('#decrypt-btn').show(); } } @@ -35,9 +35,9 @@ function decrypt() { // request $.request('post', '../ncp-launcher.php', { action: 'launch', - ref : 'nc-encrypt', + ref : 'nc-encrypt', config: '{ "ACTIVE": "yes", "PASSWORD":"' + $('#encryption-pass').get('.value') + '" }', - csrf_token: $('#csrf-token').get('.value') } + csrf_token: $('#csrf-token').get('.value') } ).then(decrypt_ok_cb).error(errorMsg); } @@ -51,7 +51,7 @@ $( '.pwd-btn' ).on('click', function(e) input.set('.type', 'password'); }); -$(function() +$(function() { $('#decrypt-btn').on('click', function(e) { diff --git a/ncp-web/decrypt/index.php b/ncp-web/decrypt/index.php index 795b1287e..6ee624179 100644 --- a/ncp-web/decrypt/index.php +++ b/ncp-web/decrypt/index.php @@ -26,7 +26,7 @@ - Unlock NextCloudPi + Unlock NextcloudPi @@ -49,7 +49,7 @@ NextCloudPi +

NextcloudPi

Encrypted instance

@@ -80,7 +80,7 @@
// GPL licensed (see end of file) * Use at your own risk! diff --git a/ncp-web/download_logs.php b/ncp-web/download_logs.php index 15413445d..d3c0ffc6c 100644 --- a/ncp-web/download_logs.php +++ b/ncp-web/download_logs.php @@ -1,6 +1,6 @@ // GPL licensed (see end of file) * Use at your own risk! diff --git a/ncp-web/elements.php b/ncp-web/elements.php index 82f62cafc..71d15c344 100644 --- a/ncp-web/elements.php +++ b/ncp-web/elements.php @@ -1,6 +1,6 @@ // GPL licensed (see end of file) * Use at your own risk! diff --git a/ncp-web/index.php b/ncp-web/index.php index e7e3f5390..6f2001b6d 100644 --- a/ncp-web/index.php +++ b/ncp-web/index.php @@ -1,6 +1,6 @@ GPL licensed (see end of file) * Use at your own risk! @@ -53,7 +53,7 @@ - NextCloudPi Panel + NextcloudPi Panel @@ -102,7 +102,7 @@


-

NextCloudPi First Run

+

NextcloudPi First Run

Click to start the configuration wizard


@@ -134,9 +134,9 @@
- "> + ">
@@ -200,14 +200,14 @@
- "> + ">
- "> + ">
@@ -285,7 +285,7 @@
-

__("NextCloudPi logs"); ?>

+

__("NextcloudPi logs"); ?>

', file_get_contents('/var/log/ncp.log')) ?>
diff --git a/ncp-web/js/ncp.js b/ncp-web/js/ncp.js index f2f8e43a9..820d840cb 100644 --- a/ncp-web/js/ncp.js +++ b/ncp-web/js/ncp.js @@ -1,5 +1,5 @@ /// -// NextCloudPi Web Panel javascript library +// NextcloudPi Web Panel javascript library // // Copyleft 2017 by Ignacio Nunez Hernanz // GPL licensed (see end of file) * Use at your own risk! @@ -31,8 +31,8 @@ window.onpopstate = function(event) { }; function errorMsg() -{ - $('#app-content').fill( "Something went wrong. Try refreshing the page" ); +{ + $('#app-content').fill( "Something went wrong. Try refreshing the page" ); } function switch_to_section(section) @@ -161,7 +161,7 @@ function restore_bkp(button) var path = tr.get('.id'); click_app($('#nc-restore')); history.pushState(null, selectedID, "?app=" + selectedID); - $('#nc-restore-BACKUPFILE').set({ value: path }); + $('#nc-restore-BACKUPFILE').set({ value: path }); $('#nc-restore-config-button').trigger('click'); } @@ -171,7 +171,7 @@ function restore_snap(button) var path = tr.get('.id'); click_app($('#nc-restore-snapshot')); history.pushState(null, selectedID, "?app=" + selectedID); - $('#nc-restore-snapshot-SNAPSHOT').set({ value: path }); + $('#nc-restore-snapshot-SNAPSHOT').set({ value: path }); $('#nc-restore-snapshot-config-button').trigger('click'); } @@ -297,7 +297,7 @@ function print_backups() $.request('post', 'ncp-launcher.php', { action:'backups', csrf_token: $('#csrf-token-ui').get('.value') } ).then( - function success( result ) + function success( result ) { var ret = $.parseJSON( result ); if (ret.token) @@ -317,7 +317,7 @@ function reload_sidebar() $.request('post', 'ncp-launcher.php', { action:'sidebar', csrf_token: $('#csrf-token-ui').get('.value') } ).then( - function success( result ) + function success( result ) { var ret = $.parseJSON( result ); if ( ret.token ) @@ -379,7 +379,7 @@ function select_app(item) $('#' + selectedID + '-config-box').show(); } -$(function() +$(function() { // parse selected app from URL if (location.search) @@ -404,11 +404,11 @@ $(function() return str.replace(/&/g,'&').replace(//g,'>'); } - source.addEventListener('message', function(e) + source.addEventListener('message', function(e) { - if ( e.origin != 'https://' + window.location.hostname + ':4443') + if ( e.origin != 'https://' + window.location.hostname + ':4443') { - $('.details-box').fill( "Invalid origin" ); + $('.details-box').fill( "Invalid origin" ); return; } @@ -449,18 +449,18 @@ $(function() $( 'input' , '#config-box-wrapper' ).set('@disabled',true); // request - $.request('post', 'ncp-launcher.php', { action:'launch', + $.request('post', 'ncp-launcher.php', { action:'launch', ref : selectedID, config: $.toJSON(cfg), csrf_token: $( '#csrf-token' ).get( '.value' ) }).then( - function success( result ) + function success( result ) { var ret = $.parseJSON( result ); if ( ret.token ) $('#csrf-token').set( { value: ret.token } ); if ( ret.ret ) // means that the process was launched { - if ( ret.ret == '0' ) + if ( ret.ret == '0' ) { if (ret.ref) { @@ -474,7 +474,7 @@ $(function() $('.circle-retstatus').set('+icon-green-circle'); } - else + else $('.circle-retstatus').set('-icon-green-circle'); } else // print error from server instead @@ -583,7 +583,7 @@ $(function() { if ( lock ) return; lock = true; - + $( '#app-navigation ul' ).set('-active'); click_app( $('#nc-update') ); @@ -593,11 +593,11 @@ $(function() } ); // slide menu - if ( window.innerWidth <= 768 ) + if ( window.innerWidth <= 768 ) enable_slide_menu(); - window.addEventListener('resize', function(){ - if ( window.innerWidth <= 768 ) + window.addEventListener('resize', function(){ + if ( window.innerWidth <= 768 ) enable_slide_menu(); else disable_slide_menu(); @@ -624,9 +624,9 @@ $(function() $('#overlay').hide(); // request - $.request('post', 'ncp-launcher.php', { action:'poweroff', - csrf_token: $( '#csrf-token' ).get( '.value' ) }).then( - function success( result ) + $.request('post', 'ncp-launcher.php', { action:'poweroff', + csrf_token: $( '#csrf-token' ).get( '.value' ) }).then( + function success( result ) { switch_to_section( 'nc-config' ); $.off( poweroff_event_handler ); @@ -639,9 +639,9 @@ $(function() $('#poweroff-dialog').hide(); $('#overlay').hide(); // request - $.request('post', 'ncp-launcher.php', { action:'reboot', - csrf_token: $( '#csrf-token' ).get( '.value' ) }).then( - function success( result ) + $.request('post', 'ncp-launcher.php', { action:'reboot', + csrf_token: $( '#csrf-token' ).get( '.value' ) }).then( + function success( result ) { switch_to_section( 'nc-config' ); $.off( poweroff_event_handler ); @@ -654,7 +654,7 @@ $(function() { $( '#notification' ).hide(); } ); - + // close first run box $( '.first-run-close' ).on('click', function(e) { @@ -770,7 +770,7 @@ $(function() search_box.value = ''; search_box.focus(); $('.icon-search').on('click', function(e) { - + $('#search-box').show(); search_box.focus(); $('#search-box').animate( {$width: '130px'}, 150 ); diff --git a/ncp-web/l10n/de.json b/ncp-web/l10n/de.json index 59684a9ea..bea1d4fb3 100644 --- a/ncp-web/l10n/de.json +++ b/ncp-web/l10n/de.json @@ -5,5 +5,5 @@ "run": "Ausführen", "skip": "Überspringen", "close": "Schließen", - "Configure NextCloudPi features": "NextCloudPi Funktionen konfigurieren" + "Configure NextcloudPi features": "NextcloudPi Funktionen konfigurieren" }} diff --git a/ncp-web/l10n/es.json b/ncp-web/l10n/es.json index 25ed9ea09..9e6d90b05 100644 --- a/ncp-web/l10n/es.json +++ b/ncp-web/l10n/es.json @@ -1,6 +1,6 @@ { "translations": { - "Configure NextCloudPi features": "Configurar NextCloudPi", + "Configure NextcloudPi features": "Configurar NextcloudPi", "Run": "Ejecutar", "This application requires JavaScript for correct operation. Please %s enable JavaScript %s and reload the page.": "Esta aplicación requiere Javascript para un funcionamiento correcto. Por favor %s active Javascript %s y recarge la página." } diff --git a/ncp-web/ncp-launcher.php b/ncp-web/ncp-launcher.php index eff9048cc..15802ad82 100644 --- a/ncp-web/ncp-launcher.php +++ b/ncp-web/ncp-launcher.php @@ -1,6 +1,6 @@ - // GPL licensed (see end of file) * Use at your own risk! diff --git a/ncp-web/upload.php b/ncp-web/upload.php index 1dc6a7881..b495d76d1 100644 --- a/ncp-web/upload.php +++ b/ncp-web/upload.php @@ -1,6 +1,6 @@ // GPL licensed (see end of file) * Use at your own risk! @@ -19,7 +19,7 @@ isset($_FILES['backup']) or exit( '{ "output": "no upload" }' ); $error=$_FILES['backup']['error']; -if ($error !== 0) +if ($error !== 0) exit( '{ "output": "upload error ' . $error . '" }' ); $file_name = $_POST['csrf_token'] . basename($_FILES['backup']['name']); diff --git a/ncp-web/wizard/index.php b/ncp-web/wizard/index.php index 87d6fcc04..67f4a0596 100644 --- a/ncp-web/wizard/index.php +++ b/ncp-web/wizard/index.php @@ -1,6 +1,6 @@ - GPL licensed (see end of file) * Use at your own risk! @@ -27,7 +27,7 @@ - NextCloudPi Wizard + NextcloudPi Wizard @@ -57,7 +57,7 @@
-

Welcome to NextCloudPi

+

Welcome to NextcloudPi

This wizard will help you configure your personal cloud.

@@ -81,9 +81,9 @@

- If you want to prepare the USB drive to be used with NextCloudPi hit Format USB. Skip if already formated as ext4 or BTRFS. -
- Attention! This will format your USB drive as BTRFS and will destroy any current data. + If you want to prepare the USB drive to be used with NextcloudPi hit Format USB. Skip if already formated as ext4 or BTRFS. +
+ Attention! This will format your USB drive as BTRFS and will destroy any current data.

@@ -111,7 +111,7 @@

Port forwarding

To access from the outside, your need to forward ports 80 and 443 to your RPi IP address
- You can have NextCloudPi try to do this automatically for you
+ You can have NextcloudPi try to do this automatically for you
To do it manually yourself, you must access your router interface, usually at http://192.168.1.1

@@ -200,7 +200,7 @@
-

NextCloudPi is ready!

+

NextcloudPi is ready!

@@ -208,10 +208,10 @@
-
go back to NextCloudPi web panel +
go back to NextcloudPi web panel
-
+
diff --git a/ncp.sh b/ncp.sh index de9d2f7b8..9cfadac76 100644 --- a/ncp.sh +++ b/ncp.sh @@ -1,6 +1,6 @@ #!/bin/bash -# NextCloudPi additions to Raspbian +# NextcloudPi additions to Raspbian # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk! @@ -27,7 +27,7 @@ install() # include option in raspi-config (only Raspbian) test -f /usr/bin/raspi-config && { - sed -i '/Change User Password/i"0 NextCloudPi Configuration" "Configuration of NextCloudPi" \\' /usr/bin/raspi-config + sed -i '/Change User Password/i"0 NextcloudPi Configuration" "Configuration of NextcloudPi" \\' /usr/bin/raspi-config sed -i '/1\\ \*) do_change_pass ;;/i0\\ *) ncp-config ;;' /usr/bin/raspi-config # Disable raspberry pi default user usermod pi -s /sbin/nologin @@ -253,7 +253,7 @@ EOF ## tag image is_docker && local DOCKER_TAG="_docker" is_lxc && local DOCKER_TAG="_lxc" - echo "NextCloudPi${DOCKER_TAG}_$( date "+%m-%d-%y" )" > /usr/local/etc/ncp-baseimage + echo "NextcloudPi${DOCKER_TAG}_$( date "+%m-%d-%y" )" > /usr/local/etc/ncp-baseimage ## SSH hardening if [[ -f /etc/ssh/sshd_config ]]; then diff --git a/run_update_history.sh b/run_update_history.sh index 4faa5c2fb..5b11151ab 100755 --- a/run_update_history.sh +++ b/run_update_history.sh @@ -55,7 +55,7 @@ if is_more_recent_than "$latest_checkpoint_version" "$current_version" ; then mid_version=$( basename ${updates_list[$mid]} .sh ) - if is_more_recent_than "$mid_version" "$current_version" ; then + if is_more_recent_than "$mid_version" "$current_version" ; then # Mid's version update is applicable to the current version # Check if the previous checkpoint (mid-1) is applicable @@ -108,7 +108,7 @@ if is_more_recent_than "$latest_checkpoint_version" "$current_version" ; then exit 1 } echo "v$tag_update" > /usr/local/etc/ncp-version - [[ $i != $end_of_list ]] && echo -e "NextCloudPi updated to version v$tag_update" || true + [[ $i != $end_of_list ]] && echo -e "NextcloudPi updated to version v$tag_update" || true done fi diff --git a/tests/activation_tests.py b/tests/activation_tests.py index 7e871e595..b606be380 100755 --- a/tests/activation_tests.py +++ b/tests/activation_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ -Automatic testing for NextCloudPi +Automatic testing for NextcloudPi Copyleft 2017 by Ignacio Nunez Hernanz GPL licensed (see LICENSE file in repository root). @@ -99,7 +99,7 @@ def test_activation(IP, nc_port, admin_port, options, wait_timeout=120): driver.implicitly_wait(5) test.new("activation opens") driver.get(f"https://{IP}:{nc_port}") - test.check("NextCloudPi Activation" in driver.title) + test.check("NextcloudPi Activation" in driver.title) try: ncp_pass = driver.find_element(By.ID, "ncp-pwd").get_attribute("value") nc_pass = driver.find_element(By.ID, "nc-pwd").get_attribute("value") @@ -146,7 +146,7 @@ def test_activation(IP, nc_port, admin_port, options, wait_timeout=120): except Exception as e: print(f"WARN: Exception while attempting to get ncp-web: '{e}'") raise e - test.check("NextCloudPi Panel" in driver.title) + test.check("NextcloudPi Panel" in driver.title) test.report("first run wizard", is_element_present(driver, By.ID, "first-run-wizard")) driver.close() diff --git a/tests/nextcloud_tests.py b/tests/nextcloud_tests.py index 6005595de..2bc5362cb 100755 --- a/tests/nextcloud_tests.py +++ b/tests/nextcloud_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ -Automatic testing for NextCloudPi +Automatic testing for NextcloudPi Copyleft 2017 by Ignacio Nunez Hernanz GPL licensed (see LICENSE file in repository root). @@ -124,7 +124,7 @@ def test_nextcloud(IP: str, nc_port: str, driver: WebDriver): driver.get(f"https://{IP}:{nc_port}/index.php/settings/admin/overview") except Exception as e: test.check(e, msg=f"{tc.red}error:{tc.normal} unable to reach {tc.yellow + IP + tc.normal}") - test.check("NextCloudPi" in driver.title, msg="NextCloudPi not found in page title!") + test.check("NextcloudPi" in driver.title, msg="NextcloudPi not found in page title!") trusted_domain_str = "You are accessing the server from an untrusted domain" test.report("trusted domain", trusted_domain_str not in driver.page_source, f"Domain '{IP}' is not trusted") try: diff --git a/tests/system_tests.py b/tests/system_tests.py index dacbb18e3..7398bfb39 100755 --- a/tests/system_tests.py +++ b/tests/system_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ -Automatic system testing for NextCloudPi +Automatic system testing for NextcloudPi Copyleft 2018 by Ignacio Nunez Hernanz GPL licensed (see LICENSE file in repository root). @@ -275,7 +275,7 @@ def signal_handler(sig, frame): print(pre_cmd) # checks - print("\nNextCloudPi system checks") + print("\nNextcloudPi system checks") print("-------------------------") running_result = check_processes_running(processes_must_be_running) install_result = check_binaries_installed(binaries_must_be_installed) diff --git a/update.sh b/update.sh index 970d3a391..7db87817a 100755 --- a/update.sh +++ b/update.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Updater for NextCloudPi +# Updater for NextcloudPi # # Copyleft 2017 by Ignacio Nunez Hernanz # GPL licensed (see end of file) * Use at your own risk!