|
@@ -37,16 +37,13 @@ SHOW_ICANN_ADDRESS_ON_ABOUT=0
|
37
|
37
|
|
38
|
38
|
SCUTTLEBOT_VERSION='9.8.0'
|
39
|
39
|
SCUTTLEBOT_PORT=8008
|
40
|
|
-SCUTTLEBOT_ONION_PORT=8118
|
41
|
40
|
|
42
|
41
|
scuttlebot_variables=(MY_USERNAME
|
43
|
42
|
DEFAULT_DOMAIN_NAME
|
44
|
43
|
SYSTEM_TYPE)
|
45
|
44
|
|
46
|
45
|
function scuttlebot_create_invite {
|
47
|
|
- read_config_param 'DEFAULT_DOMAIN_NAME'
|
48
|
|
- SCUTTLEBOT_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_scuttlebot/hostname)
|
49
|
|
- invite_string=$(su -c "sbot invite.create 1" - scuttlebot | sed 's/"//g' | sed "s/$DEFAULT_DOMAIN_NAME/$SCUTTLEBOT_ONION_HOSTNAME/g")
|
|
46
|
+ invite_string=$(su -c "sbot invite.create 1" - scuttlebot | sed 's/"//g')
|
50
|
47
|
|
51
|
48
|
clear
|
52
|
49
|
echo -e '\n\nYour Scuttlebot invite code is:\n\n'${invite_string}'\n\n'
|
|
@@ -168,9 +165,6 @@ function remove_scuttlebot {
|
168
|
165
|
systemctl disable scuttlebot
|
169
|
166
|
rm /etc/systemd/system/scuttlebot.service
|
170
|
167
|
|
171
|
|
- function_check remove_onion_service
|
172
|
|
- remove_onion_service scuttlebot ${SCUTTLEBOT_ONION_PORT}
|
173
|
|
-
|
174
|
168
|
userdel -r scuttlebot
|
175
|
169
|
|
176
|
170
|
if [ -d /etc/scuttlebot ]; then
|
|
@@ -227,8 +221,6 @@ function install_scuttlebot {
|
227
|
221
|
|
228
|
222
|
sleep 3
|
229
|
223
|
|
230
|
|
- SCUTTLEBOT_ONION_HOSTNAME=$(add_onion_service scuttlebot ${SCUTTLEBOT_PORT} ${SCUTTLEBOT_ONION_PORT})
|
231
|
|
-
|
232
|
224
|
if [ ! -d /etc/scuttlebot/.ssb ]; then
|
233
|
225
|
echo $'Scuttlebot config not generated'
|
234
|
226
|
exit 73528
|