Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix #2619 #2620

Merged
merged 6 commits into from
Apr 15, 2024
Merged

fix #2619 #2620

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3aa6c97
part fix #2619
enoch85 Apr 1, 2024
88d38bc
one solution for all files
enoch85 Apr 2, 2024
ded68e9
Update nextcloud_update.sh
enoch85 Apr 2, 2024
40c7165
Update nextcloud_update.sh
enoch85 Apr 2, 2024
00e2286
tested and works
enoch85 Apr 2, 2024
fafd124
Merge branch 'master' into 2619
enoch85 Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions nextcloud_update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,10 @@ fi
print_text_in_color "$IGreen" "Disabling maintenance:mode..."
sudo -u www-data php "$NCPATH"/occ maintenance:mode --off

# Make all previous files executable
print_text_in_color "$ICyan" "Finding all executable files in $NC_APPS_PATH"
find_executables="$(find $NC_APPS_PATH -type f -executable)"

# Update all Nextcloud apps
if [ "${CURRENTVERSION%%.*}" -ge "15" ]
then
Expand Down Expand Up @@ -760,15 +764,16 @@ else
print_text_in_color "$IGreen" "Your apps are already up to date!"
fi

# Nextcloud 13 is required.
lowest_compatible_nc 13

# Restart notify push if existing
if [ -f "$NOTIFY_PUSH_SERVICE_PATH" ]
then
systemctl restart notify_push
chmod +x "$NC_APPS_PATH"/notify_push/bin/x86_64/notify_push
systemctl restart notify_push.service
fi

# Nextcloud 13 is required.
lowest_compatible_nc 13

if [ -f /tmp/minor.version ]
then
NCBAD=$(cat /tmp/minor.version)
Expand Down Expand Up @@ -1247,6 +1252,12 @@ then
mkdir -p "$VMLOGS"
fi

# Make all files in executable again
for executable in $find_executables
do
chmod +x "$executable"
done

CURRENTVERSION_after=$(nextcloud_occ status | grep "versionstring" | awk '{print $3}')
if [[ "$NCVERSION" == "$CURRENTVERSION_after" ]] || [ -n "$PRERELEASE_VERSION" ]
then
Expand Down