diff options
Diffstat (limited to 'docs/en/admins/07_LinuxUpdate.md')
| -rw-r--r-- | docs/en/admins/07_LinuxUpdate.md | 107 |
1 files changed, 48 insertions, 59 deletions
diff --git a/docs/en/admins/07_LinuxUpdate.md b/docs/en/admins/07_LinuxUpdate.md index c1b2da5f5..6323c2a1a 100644 --- a/docs/en/admins/07_LinuxUpdate.md +++ b/docs/en/admins/07_LinuxUpdate.md @@ -24,87 +24,76 @@ You may wish to run the cron task or systemd unit (`freshrss.service`) immediate **You must have used git to install FreshRSS to use this update method.** -If your local user doesn't have write access to the FreshRSS folder, use a sudo shell (`sudo -s`), prefix the following commands with `sudo `, or switch to an account that does have write access to the folder. +If your local user doesn't have write access to the FreshRSS folder, use a sudo shell (`sudo -s`), prefix the following commands with `sudo`, or switch to an account that does have write access to the folder. 1. Change to your FreshRSS directory - -```sh -cd /usr/share/FreshRSS/ -``` + ```sh + cd /usr/share/FreshRSS/ + ``` 2. Fetch the most recent code from GitHub - -```sh -git fetch --all -``` + ```sh + git fetch --all + ``` 3. Discard manual changes and delete manual additions + ```sh + git reset --hard + git clean -f -d + ``` -```sh -git reset --hard -git clean -f -d -``` - -Note: If you wish to keep your changes, it's better to [create a pull request](https://github.com/FreshRSS/FreshRSS/compare) or [an extension](../developers/03_Backend/05_Extensions.md). + Note: If you wish to keep your changes, it's better to [create a pull request](https://github.com/FreshRSS/FreshRSS/compare) or [an extension](../developers/03_Backend/05_Extensions.md). 4. Update FreshRSS + ```sh + git checkout edge + git pull + git checkout $(git describe --tags --abbrev=0) + ``` -```sh -git checkout edge -git pull -git checkout $(git describe --tags --abbrev=0) -``` - -Note: If you want to use the rolling release, the last command is optional. + Note: If you want to use the rolling release, the last command is optional. 5. (optional) Make sure you use the correct version + ```sh + git status + ``` -```sh -git status -``` - -The command should tell you the tag that you're using. It must be the same as the one associated with [the latest release on GitHub](https://github.com/FreshRSS/FreshRSS/releases/latest). If you use the rolling release, it should tell you that your `edge` branch is up to date with `origin`. + The command should tell you the tag that you're using. It must be the same as the one associated with [the latest release on GitHub](https://github.com/FreshRSS/FreshRSS/releases/latest). If you use the rolling release, it should tell you that your `edge` branch is up to date with `origin`. 6. Re-set correct permissions so that your web server can access the files - -```sh -chown -R :www-data . && chmod -R g+r . && chmod -R g+w ./data/ -``` + ```sh + chown -R :www-data . && chmod -R g+r . && chmod -R g+w ./data/ + ``` ## Using the Zip archive If your local user doesn't have write access to the FreshRSS folder, use a sudo shell (`sudo -s`), prefix the following commands with `sudo`, or switch to an account that does have write access to the folder. 1. Change to your FreshRSS directory - -```sh -cd /usr/share/FreshRSS/ -``` + ```sh + cd /usr/share/FreshRSS/ + ``` 2. Get the link to the Zip archive for [the latest release](https://github.com/FreshRSS/FreshRSS/releases/latest): [`https://github.com/FreshRSS/FreshRSS/archive/latest.zip`](https://github.com/FreshRSS/FreshRSS/archive/latest.zip). If you want to use the rolling release, the link is [`https://github.com/FreshRSS/FreshRSS/archive/edge.zip`](https://github.com/FreshRSS/FreshRSS/archive/edge.zip). 3. Download and unzip the update file - -```sh -wget -O freshrss.zip https://github.com/FreshRSS/FreshRSS/archive/latest.zip -unzip freshrss.zip -``` - -3. Overwrite all your existing files with the new ones - -```sh -cp -R FreshRSS-*/* . -``` - -4. Re-set permissions - -```sh -chown -R :www-data . && chmod -R g+r . && chmod -R g+w ./data/ -``` - -5. Clean up the FreshRSS directory by deleting the downloaded zip, the file forcing the setup wizard and the temporary directory - -```sh -rm -f freshrss.zip -rm -rf FreshRSS-*/ -``` + ```sh + wget -O freshrss.zip https://github.com/FreshRSS/FreshRSS/archive/latest.zip + unzip freshrss.zip + ``` + +4. Overwrite all your existing files with the new ones + ```sh + cp -R FreshRSS-*/* . + ``` + +5. Re-set permissions + ```sh + chown -R :www-data . && chmod -R g+r . && chmod -R g+w ./data/ + ``` + +6. Clean up the FreshRSS directory by deleting the downloaded zip, the file forcing the setup wizard and the temporary directory + ```sh + rm -f freshrss.zip + rm -rf FreshRSS-*/ + ``` |