diff options
| author | 2021-03-15 00:00:25 +0100 | |
|---|---|---|
| committer | 2021-03-15 00:00:25 +0100 | |
| commit | 1c3159058fd256ec7163a29c9865dbd3dbe05f17 (patch) | |
| tree | 5b3a9df3cc709a4b370f6f03cf79c50483275344 /docs/en/admins/07_LinuxUpdate.md | |
| parent | 769f34e958b50e748acf6a151805f4a255df2043 (diff) | |
Quick update the doc for master renaming to edge
Diffstat (limited to 'docs/en/admins/07_LinuxUpdate.md')
| -rw-r--r-- | docs/en/admins/07_LinuxUpdate.md | 46 |
1 files changed, 29 insertions, 17 deletions
diff --git a/docs/en/admins/07_LinuxUpdate.md b/docs/en/admins/07_LinuxUpdate.md index 40698ab81..6f39f5a45 100644 --- a/docs/en/admins/07_LinuxUpdate.md +++ b/docs/en/admins/07_LinuxUpdate.md @@ -27,17 +27,20 @@ You may wish to run the cron task or systemd unit (`freshrss.service`) immediate 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/ ``` 2. Fetch the most recent code from GitHub -``` + +```sh git fetch --all ``` 3. Discard manual changes and delete manual additions -``` + +```sh git reset --hard git clean -f -d ``` @@ -45,8 +48,9 @@ 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). 4. Update FreshRSS -``` -git checkout master + +```sh +git checkout edge git pull git checkout $(git describe --tags --abbrev=0) ``` @@ -54,51 +58,59 @@ git checkout $(git describe --tags --abbrev=0) 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 ``` -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 `master` 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. Delete the file that triggers the install wizard -``` + +```sh rm data/do-install.txt ``` 7. 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/ ``` ## 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. +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/ ``` -2. Get the link to the Zip archive for [the latest release](https://github.com/FreshRSS/FreshRSS/releases/latest). It should be something like `https://github.com/FreshRSS/FreshRSS/archive/1.15.3.zip` (the numbers can change). If you want to use the rolling release, the link is `https://github.com/FreshRSS/FreshRSS/archive/master.zip` +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 -``` -wget -O freshrss.zip https://github.com/FreshRSS/FreshRSS/archive/1.15.3.zip + +```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 -f data/do-install.txt rm -rf FreshRSS-*/ |
