From ebd81dad9d99745e903ed905644101684a16e682 Mon Sep 17 00:00:00 2001 From: slrslr <6596726+slrslr@users.noreply.github.com> Date: Sun, 30 Jul 2023 05:17:15 +0000 Subject: [PATCH 1/4] Update README.md Adding new simplified installation commands. It should allow easier installation and update on most Linux distributions using 2 commands. --- README.md | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 0716c869..0a1f641f 100644 --- a/README.md +++ b/README.md @@ -6,15 +6,14 @@ [по-русски](README-ru.md) | [em português](README-ptbr.md) | [简体中文](README-zh-cn.md) -zeronet-conservancy is a fork/continuation of [ZeroNet](https://github.com/HelloZeroNet/ZeroNet) project +Zeronet-Conservancy is a fork/continuation of [ZeroNet](https://github.com/HelloZeroNet/ZeroNet) project (that has been abandoned by its creator) that is dedicated to sustaining existing p2p network and developing its values of decentralization and freedom, while gradually switching to a better designed network ## No active maintainer warning This fork was created and maintained by @caryoscelus, but due to vanishing interest and in order to avoid having -another one-person project, they stepped down. This means there currently is no active maintainer (you're are -welcome to become one!), however some development might still happen. +another one-person project, the development is limitted. ## Why fork? @@ -75,25 +74,34 @@ Following links relate to original ZeroNet: ### Install from your distribution repository -- NixOS: https://search.nixos.org/packages?channel=22.05&show=zeronet-conservancy&type=packages&query=zeronet-conservancy (and see below) +- NixOS: [zeronet-conservancy packages search](https://search.nixos.org/packages?from=0&size=50&sort=relevance&type=packages&query=zeronet-conservancy) (and see below) - ArchLinux: [latest release](https://aur.archlinux.org/packages/zeronet-conservancy), [fresh git version](https://aur.archlinux.org/packages/zeronet-conservancy-git) ### Install from Nix package manager (Linux or MacOS) -``` -# install & configure nix package manager -nix-env -iA nixpkgs.zeronet-conservancy -``` - +if you're on NixOS, install & configure nix package manager: +```nix-env -iA nixpkgs.zeronet-conservancy``` or - -`nix-env -iA nixos.zeronet-conservancy` - -if you're on NixOS - +```nix-env -iA nixos.zeronet-conservancy``` (thanks @fgaz for making & maintaining the package) -### Install from source +### Install from source - simplified, using Git and Python PIP + +1. Install Git and Python PIP package: + +- Debian and Ubuntu based: `sudo apt install git python3-pip -y` +- Red Hat and Fedora based: `yum install epel-release -y 2>/dev/null;yum install git python3 python3-wheel` +- Fedora based dandified: `sudo dnf install git python3-pip python3-wheel -y` +- Arch and Manjaro based: `sudo pacman -S git python-pip -v --no-confirm` +- openSUSE: `sudo zypper install python3-pip python3-setuptools python3-wheel` + +2. Clone Github repository and install required Python modules. First edit zndir path at the begining of the command, to be the path where you want to store Zeronet-Conservancy: + +`zndir="/home/user/myapps/zeronet" ; if [[ ! -d "$zndir" ]]; then git clone --recursive "https://github.com/zeronet-conservancy/zeronet-conservancy.git" "$zndir" && cd "$zndir"||exit; else cd "$zndir";git pull origin master; fi; cd "$zndir" && pip install -r requirements.txt|grep -v "already satisfied"; echo "Try to run: python3 $(pwd)/zeronet.py"` + +(This command can also be used to keep Zeronet-Conservancy up to date) + +### Install from source - detailed #### System dependencies @@ -143,9 +151,9 @@ Install autoconf and other basic development tools, python3 and pip, then procee - after installing general dependencies and cloning repo (as above), run `start-venv.sh` which will create a virtual env for you and install python requirements - more convenience scripts to be added soon -### Building under windows os +### Building under Windows OS -(this instruction is work-in-progress, please help us test it and improve it!) +(These instructions are work-in-progress, please help us test it and improve it!) - install python from https://www.python.org/downloads/ - install some windows compiler suitable for python , this proved to be the most difficult part for me as non-windows user (see here https://wiki.python.org/moin/WindowsCompilers and i'll link more references later) From 7d4e66e07b6ced6bfc9c13cf3e9296c21ac517ef Mon Sep 17 00:00:00 2001 From: slrslr <6596726+slrslr@users.noreply.github.com> Date: Mon, 31 Jul 2023 18:34:11 +0000 Subject: [PATCH 2/4] Update README.md Mention first Windows build available for download. --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 0a1f641f..1319b13a 100644 --- a/README.md +++ b/README.md @@ -151,6 +151,10 @@ Install autoconf and other basic development tools, python3 and pip, then procee - after installing general dependencies and cloning repo (as above), run `start-venv.sh` which will create a virtual env for you and install python requirements - more convenience scripts to be added soon +### Windows build + +Download and extract .zip archive [zeronet-conservancy-0.7.10-unofficial-win64.zip](https://github.com/zeronet-conservancy/zeronet-conservancy/releases/download/v0.7.10/zeronet-conservancy-0.7.10-unofficial-win64.zip) + ### Building under Windows OS (These instructions are work-in-progress, please help us test it and improve it!) From b95b979c7fc31a337fc3ca545bab51a0576a1227 Mon Sep 17 00:00:00 2001 From: caryoscelus Date: Thu, 10 Aug 2023 20:30:24 +0000 Subject: [PATCH 3/4] README: partially rewrite installing --- README.md | 64 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 1319b13a..00ce2fda 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [по-русски](README-ru.md) | [em português](README-ptbr.md) | [简体中文](README-zh-cn.md) -Zeronet-Conservancy is a fork/continuation of [ZeroNet](https://github.com/HelloZeroNet/ZeroNet) project +`zeronet-conservancy` is a fork/continuation of [ZeroNet](https://github.com/HelloZeroNet/ZeroNet) project (that has been abandoned by its creator) that is dedicated to sustaining existing p2p network and developing its values of decentralization and freedom, while gradually switching to a better designed network @@ -79,40 +79,39 @@ Following links relate to original ZeroNet: ### Install from Nix package manager (Linux or MacOS) -if you're on NixOS, install & configure nix package manager: -```nix-env -iA nixpkgs.zeronet-conservancy``` -or -```nix-env -iA nixos.zeronet-conservancy``` + - install & configure nix package manager (if needed) + - `nix-env -iA nixpkgs.zeronet-conservancy` + +or add `zeronet-conservancy` to your system configuration if you're on NixOS + (thanks @fgaz for making & maintaining the package) -### Install from source - simplified, using Git and Python PIP - -1. Install Git and Python PIP package: - -- Debian and Ubuntu based: `sudo apt install git python3-pip -y` -- Red Hat and Fedora based: `yum install epel-release -y 2>/dev/null;yum install git python3 python3-wheel` -- Fedora based dandified: `sudo dnf install git python3-pip python3-wheel -y` -- Arch and Manjaro based: `sudo pacman -S git python-pip -v --no-confirm` -- openSUSE: `sudo zypper install python3-pip python3-setuptools python3-wheel` - -2. Clone Github repository and install required Python modules. First edit zndir path at the begining of the command, to be the path where you want to store Zeronet-Conservancy: - -`zndir="/home/user/myapps/zeronet" ; if [[ ! -d "$zndir" ]]; then git clone --recursive "https://github.com/zeronet-conservancy/zeronet-conservancy.git" "$zndir" && cd "$zndir"||exit; else cd "$zndir";git pull origin master; fi; cd "$zndir" && pip install -r requirements.txt|grep -v "already satisfied"; echo "Try to run: python3 $(pwd)/zeronet.py"` - -(This command can also be used to keep Zeronet-Conservancy up to date) - -### Install from source - detailed +### Install from source #### System dependencies ##### Generic unix-like (including mac os x) Install autoconf and other basic development tools, python3 and pip, then proceed to "building python dependencies" +(if running fails due to missing dependency, please report it/make pull request to fix dependency list) ##### Apt-based (debian, ubuntu, etc) - `sudo apt update` - `sudo apt install pkg-config libffi-dev python3-pip python3-venv python3-dev build-essential` +##### Red Hat and Fedora based + - `yum install epel-release -y 2>/dev/null` + - `yum install git python3 python3-wheel` + +##### Fedora based dandified + - `sudo dnf install git python3-pip python3-wheel -y` + +##### openSUSE + - `sudo zypper install python3-pip python3-setuptools python3-wheel` + +##### Arch and Manjaro based + - `sudo pacman -S git python-pip -v --no-confirm` + ##### Android/Termux - install [Termux](https://termux.com/) (in Termux you can install packages via `pkg install `) - `pkg update` @@ -122,7 +121,7 @@ Install autoconf and other basic development tools, python3 and pip, then procee - (optional) `pkg install tor` - (optional) run tor via `tor --ControlPort 9051 --CookieAuthentication 1` command (you can then open new session by swiping to the right) -#### Building python dependencies venv & running +#### Building python dependencies, venv & running - clone this repo (NOTE: on Android/Termux you should clone it into "home" folder of Termux, because virtual environment cannot live in `storage/`) - `python3 -m venv venv` (make python virtual environment, the last `venv` is just a name, if you use different you should replace it in later commands) - `source venv/bin/activate` (activate environment) @@ -147,13 +146,26 @@ Install autoconf and other basic development tools, python3 and pip, then procee - or: `docker compose up -d 0net-tor` for run 0net and tor in one container. (please check if these instructions are still accurate) +#### Alternative one-liner (installing python dependencies globally) + +Clone Github repository and install required Python modules. First +edit zndir path at the begining of the command, to be the path where +you want to store `zeronet-conservancy`: + +`zndir="/home/user/myapps/zeronet" ; if [[ ! -d "$zndir" ]]; then git clone --recursive "https://github.com/zeronet-conservancy/zeronet-conservancy.git" "$zndir" && cd "$zndir"||exit; else cd "$zndir";git pull origin master; fi; cd "$zndir" && pip install -r requirements.txt|grep -v "already satisfied"; echo "Try to run: python3 $(pwd)/zeronet.py"` + +(This command can also be used to keep `zeronet-conservancy` up to date) + #### Alternative script - - after installing general dependencies and cloning repo (as above), run `start-venv.sh` which will create a virtual env for you and install python requirements + - after installing general dependencies and cloning repo (as above), + run `start-venv.sh` which will create a virtual env for you and + install python requirements - more convenience scripts to be added soon -### Windows build +### (unofficial) Windows OS build -Download and extract .zip archive [zeronet-conservancy-0.7.10-unofficial-win64.zip](https://github.com/zeronet-conservancy/zeronet-conservancy/releases/download/v0.7.10/zeronet-conservancy-0.7.10-unofficial-win64.zip) +Download and extract .zip archive +[zeronet-conservancy-0.7.10-unofficial-win64.zip](https://github.com/zeronet-conservancy/zeronet-conservancy/releases/download/v0.7.10/zeronet-conservancy-0.7.10-unofficial-win64.zip) ### Building under Windows OS From 77a70e513dffaabbca10cd0659f28dac3d599e2f Mon Sep 17 00:00:00 2001 From: caryoscelus Date: Thu, 7 Sep 2023 20:09:33 +0000 Subject: [PATCH 4/4] README: attribution --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 00ce2fda..59fa72f0 100644 --- a/README.md +++ b/README.md @@ -146,7 +146,7 @@ Install autoconf and other basic development tools, python3 and pip, then procee - or: `docker compose up -d 0net-tor` for run 0net and tor in one container. (please check if these instructions are still accurate) -#### Alternative one-liner (installing python dependencies globally) +#### Alternative one-liner (by @ssdifnskdjfnsdjk) (installing python dependencies globally) Clone Github repository and install required Python modules. First edit zndir path at the begining of the command, to be the path where