1.19.03
This commit is contained in:
maqp
parent
63d625e9fd
commit
6ab753565e
44
install.sh
44
install.sh
|
|
@ -155,10 +155,10 @@ install_tcb () {
|
|||
|
||||
kill_network
|
||||
|
||||
create_user_data_dir
|
||||
|
||||
verify_files
|
||||
|
||||
create_user_data_dir
|
||||
|
||||
sudo python3.6 -m pip install /opt/tfc/${VIRTUALENV}
|
||||
sudo python3.6 -m virtualenv /opt/tfc/venv_tcb --system-site-packages --never-download
|
||||
|
||||
|
|
@ -186,9 +186,9 @@ install_tcb () {
|
|||
sudo rm /opt/tfc/requirements-relay.txt
|
||||
sudo rm /opt/tfc/requirements-venv.txt
|
||||
sudo rm /opt/tfc/${VIRTUALENV}
|
||||
sudo rm /opt/install.sh
|
||||
sudo rm /opt/install.sh.asc
|
||||
sudo rm /opt/pubkey.asc
|
||||
sudo rm -f /opt/install.sh
|
||||
sudo rm -f /opt/install.sh.asc
|
||||
sudo rm -f /opt/pubkey.asc
|
||||
process_tcb_dependencies "rm"
|
||||
|
||||
add_serial_permissions
|
||||
|
|
@ -206,9 +206,12 @@ install_local_test () {
|
|||
sudo torsocks git clone https://github.com/maqp/tfc.git /opt/tfc
|
||||
|
||||
verify_tcb_requirements_files
|
||||
|
||||
sudo torsocks python3.6 -m pip download --no-cache-dir -r /opt/tfc/requirements-venv.txt --require-hashes -d /opt/tfc/
|
||||
sudo torsocks python3.6 -m pip download --no-cache-dir -r /opt/tfc/requirements.txt --require-hashes -d /opt/tfc/
|
||||
|
||||
verify_files
|
||||
|
||||
upgrade_tor
|
||||
|
||||
sudo torsocks apt install terminator -y
|
||||
|
|
@ -239,9 +242,9 @@ install_local_test () {
|
|||
sudo rm /opt/tfc/requirements-relay.txt
|
||||
sudo rm /opt/tfc/requirements-venv.txt
|
||||
sudo rm /opt/tfc/${VIRTUALENV}
|
||||
sudo rm /opt/install.sh
|
||||
sudo rm /opt/install.sh.asc
|
||||
sudo rm /opt/pubkey.asc
|
||||
sudo rm -f /opt/install.sh
|
||||
sudo rm -f /opt/install.sh.asc
|
||||
sudo rm -f /opt/pubkey.asc
|
||||
process_tcb_dependencies "rm"
|
||||
|
||||
install_complete "Installation of TFC for local testing is now complete."
|
||||
|
|
@ -251,6 +254,10 @@ install_local_test () {
|
|||
install_developer () {
|
||||
dpkg_check
|
||||
|
||||
if [[ -d "$HOME/tfc/" ]]; then
|
||||
sudo rm -r $HOME/tfc/
|
||||
fi
|
||||
|
||||
upgrade_tor
|
||||
sudo torsocks apt install git libssl-dev python3-pip python3-setuptools python3-tk terminator -y
|
||||
|
||||
|
|
@ -275,6 +282,10 @@ install_developer () {
|
|||
|
||||
chmod a+rwx -R $HOME/tfc/
|
||||
|
||||
sudo rm -f /opt/install.sh
|
||||
sudo rm -f /opt/install.sh.asc
|
||||
sudo rm -f /opt/pubkey.asc
|
||||
|
||||
add_serial_permissions
|
||||
|
||||
install_complete "Installation of the TFC dev environment is now complete."
|
||||
|
|
@ -294,6 +305,8 @@ install_relay_ubuntu () {
|
|||
sudo torsocks python3.6 -m pip download --no-cache-dir -r /opt/tfc/requirements-venv.txt --require-hashes -d /opt/tfc/
|
||||
sudo torsocks python3.6 -m pip download --no-cache-dir -r /opt/tfc/requirements.txt --require-hashes -d /opt/tfc/
|
||||
|
||||
verify_files
|
||||
|
||||
upgrade_tor
|
||||
|
||||
torsocks python3.6 -m pip install -r /opt/tfc/requirements-venv.txt --require-hashes
|
||||
|
|
@ -322,9 +335,9 @@ install_relay_ubuntu () {
|
|||
sudo rm /opt/tfc/requirements-venv.txt
|
||||
sudo rm /opt/tfc/tfc.py
|
||||
sudo rm /opt/tfc/${VIRTUALENV}
|
||||
sudo rm /opt/install.sh
|
||||
sudo rm /opt/install.sh.asc
|
||||
sudo rm /opt/pubkey.asc
|
||||
sudo rm -f /opt/install.sh
|
||||
sudo rm -f /opt/install.sh.asc
|
||||
sudo rm -f /opt/pubkey.asc
|
||||
process_tcb_dependencies "rm"
|
||||
|
||||
add_serial_permissions
|
||||
|
|
@ -344,6 +357,9 @@ install_relay_tails () {
|
|||
t_sudo apt install git libssl-dev python3-pip python3-setuptools -y
|
||||
t_sudo git clone https://github.com/maqp/tfc.git /opt/tfc
|
||||
|
||||
verify_tcb_requirements_files
|
||||
verify_files
|
||||
|
||||
create_user_data_dir
|
||||
|
||||
t_sudo python3.6 -m pip download --no-cache-dir -r /opt/tfc/requirements-relay.txt --require-hashes -d /opt/tfc/
|
||||
|
|
@ -419,9 +435,9 @@ install_relay_tails () {
|
|||
t_sudo rm /opt/tfc/${PYCPARSER}
|
||||
t_sudo rm /opt/tfc/${CFFI}
|
||||
t_sudo rm /opt/tfc/${CRYPTOGRAPHY}
|
||||
t_sudo rm /opt/install.sh
|
||||
t_sudo rm /opt/install.sh.asc
|
||||
t_sudo rm /opt/pubkey.asc
|
||||
t_sudo rm -f /opt/install.sh
|
||||
t_sudo rm -f /opt/install.sh.asc
|
||||
t_sudo rm -f /opt/pubkey.asc
|
||||
|
||||
install_complete "Installation of the TFC Relay configuration is now complete."
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEE6o84umdLJC6ZRIRcmBNw6XJaD7oFAlxJJdcACgkQmBNw6XJa
|
||||
D7olYg//e/0wmfZEkZXbmC4/uf6NHtltlqG1hDzzYilDdSmMe8kJNIEji2pPcYMZ
|
||||
n8k9lNASYyJWx4LikxM25XsgLKAdT/WaqeFSS8/Lh7akWfSJ6tZhMTj1e+6gWEaL
|
||||
AsZlINROmNzgTVz+KLLgMiedmMFKzAa93D8jbPwbzOzRB2yjdI19VEIYaeotHj2y
|
||||
z/Zx8XpmfLYIVIbGLY6v5H5CPOGjHKfRSOje806AFpEAA29n80D45ghmYvQFNj4a
|
||||
HTnsc+yM181Tod8+l4RZ2p+QqbpjsDTZyVpJUlUF4dTaPKzCThvT0KZSaIUBGtoR
|
||||
CM8NmuOCRjSsK7lUHEtTDZ8jjkb5C6B2wjZrKq12dVDLyDNKicitop6VzQZdcM4Y
|
||||
KYRCS5Et4m7Y9g9GhdQf7DFljD8nkwF9cvF47JIeGcq4eVqw4jsqi0KuxY1UXhib
|
||||
1/uKEqy6WZ50MaaIosq5uBPzXGJQJ0nod+OWkEfT3EBU0qFnOdebrWB+T3vWn3kN
|
||||
GwItVroiK7NCTGtWvZx5jQ+Wd4BAsoh29zGhE1mm7bjd8VTB/QuE/uVtGOyoFPYL
|
||||
85oFCGVrQoPLH/Htu2mbT1YLC0bliSYd+ORG8ZMU+ijaf+hDQO20Vp9UbAzlzFZw
|
||||
uTh189Ln9i/E3i2sNtcGwQVhtx7IgjNplrLLMcOepfd6qxP6ylc=
|
||||
=PV9K
|
||||
iQIzBAABCAAdFiEE6o84umdLJC6ZRIRcmBNw6XJaD7oFAlxJJgEACgkQmBNw6XJa
|
||||
D7oMsxAAvs+LMPzFX1YAqnzIv1b487fwwlzu0mUqG0kWJ5mZzeTY9J3awaQ7KZmo
|
||||
VvhxvUG0ccKw37TP8KG/QrMZuF0Svgr4WunDRFvKE/Bo72C8XOg5IMYfa1Nq2mRb
|
||||
ROMTXR7AUQHD9htajjXUCH4emF7aHsQSZo5RintNUqNBUD8j1fzGYRYdeA4y8a9M
|
||||
9spGgC6CUBFKhzIWCBDCQ0K/tKwufQVvcDuz8furc/hLbg2hzUg6R+F+HfzGRa9S
|
||||
S3c0/R89n2rvoF3wJ/A6jf/ulqSIFgqBFV9DaptzdTq3Gi9BNSlIFkg2K176OSj4
|
||||
+LMba7Q6XzpBRCTwyj8nBy8hAHAAQByrJY/mWF5nH5DTIpjE91MUkckPhZyyZFqj
|
||||
QCP/3IaLV4iJ4otATUCglCwtFVO/twLTcMRhnCHgGsHjas+TTmm/N5Q0OYrvGNpK
|
||||
fUHUnxYNKrr8RaLy3Rt7y+UuidX1SigEvPsWNlTv0Syt85QARRVJHYF56cjaktdL
|
||||
oB4eYR+3cwlKvR+v4B71npz21CmFahUSYAGI1adEEQRsEfKLVPqb9XAg54QDJzUr
|
||||
xgbfZTpEPd9PxfBQNHlXhQVuo0CukOI66bx7nnPZKfBbq0wiV17rnIgex+8gvLXQ
|
||||
k/R96kWWYkTEfydXWDX5yFPAGRzXHPp0Eb5Kc4lVgHIuRLycB7w=
|
||||
=GmPi
|
||||
-----END PGP SIGNATURE-----
|
||||
|
|
|
|||
Loading…
Reference in New Issue