External-Mirrors/nextcloudpi
2
0
Fork 0
mirror of https://github.com/nextcloud/nextcloudpi.git synced 2026-01-09 14:42:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Use dpkg for architecture detection (#1481)

Browse Source
This commit is contained in:
DesktopECHO 2022-08-25 08:13:02 -03:00 committed by GitHub
parent c072a9c4d7
commit c41d38aa2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/ncp-update-nc
View File

@ -194,8 +194,8 @@ else
apachectl -k graceful
## make sure the notify_push daemon is runnnig
arch="$(uname -m)"
[[ "${arch}" =~ "armv7" ]] && arch="armv7"
arch="$(dpkg --print-architecture)"
[[ "${arch}" =~ ^(armhf|arm)$ ]] && arch="armv7"
cat > /etc/systemd/system/notify_push.service <<EOF
[Unit]
Description = Push daemon for Nextcloud clients

2
bin/ncp/CONFIG/nc-init.sh
View File

@ -152,7 +152,7 @@ EOF
ncc app:disable updatenotification
# News dropped support for 32-bit -> https://github.com/nextcloud/news/issues/1423
if ! [[ "$(uname -m)" =~ "armv7" ]]; then
if ! [[ "$(dpkg --print-architecture)" =~ ^(armhf|arm)$ ]]; then
ncc app:install news
ncc app:enable news
fi

4
etc/library.sh
View File

@ -164,8 +164,8 @@ function start_notify_push
pgrep notify_push &>/dev/null && return
if [[ -f /.docker-image ]]; then
local arch
arch="$(uname -m)"
[[ "${arch}" =~ "armv7" ]] && arch="armv7"
arch="$(dpkg --print-architecture)"
[[ "${arch}" =~ ^(armhf|arm)$ ]] && arch="armv7"
NEXTCLOUD_URL=https://localhost sudo -E -u www-data /var/www/nextcloud/apps/notify_push/bin/"${arch}"/notify_push --allow-self-signed /var/www/nextcloud/config/config.php &>/dev/null &
else
systemctl enable --now notify_push

4
updates/1.43.0.sh
View File

@ -35,8 +35,8 @@ install_app nc-restore
[[ ! -f /.docker-image ]] && {
# fix HPB with dynamic public IP
arch="$(uname -m)"
[[ "${arch}" =~ "armv7" ]] && arch="armv7"
arch="$(dpkg --print-architecture)"
[[ "${arch}" =~ ^(armhf|arm)$ ]] && arch="armv7"
cat > /etc/systemd/system/notify_push.service <<EOF
[Unit]
Description = Push daemon for Nextcloud clients