nikoroxy/torxi
1
0
Fork 0
Code Issues Pull Requests Activity

removed root permissions check and edited location message rendering

Browse Source
This commit is contained in:
Nicola Rossello
2024-03-18 00:17:40 +01:00
parent 0c7417cf96
commit b588490b07
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
torxi.sh
View File

@@ -61,10 +61,10 @@ function print_banner {
function startupChecks { function startupChecks {
#Make sure we are root #Make sure we are root
if [ "$(whoami)" != "root" ]; then # if [ "$(whoami)" != "root" ]; then
printf "$red%s$transparent\n\n" "[This script needs to be run as root or with sudo.]" # printf "$red%s$transparent\n\n" "[This script needs to be run as root or with sudo.]"
exit 1 # exit 1
fi # fi
#Is Docker Daemon running? #Is Docker Daemon running?
docker ps &> /dev/null docker ps &> /dev/null
@@ -306,7 +306,17 @@ function checkip {
function geoiplookup { function geoiplookup {
geoipreply=$(curl -s "ipinfo.io/${1}") geoipreply=$(curl -s "ipinfo.io/${1}")
export _geoipmsg="We're surfing from ${1} geolocated at $(echo $geoipreply|jq -r .city), in $(echo $geoipreply|jq -r .region) ($(echo $geoipreply|jq -r .country))" _city="$(echo $geoipreply|jq -r .city)"
_region="$(echo $geoipreply|jq -r .region)"
_country="$(echo $geoipreply|jq -r .country)"
if [ "$_city" != "$_region" ];then
_location="$_city, in $_region ($_country)"
else
_location="$_city ($_country)"
fi
export _geoipmsg="We're surfing from ${1} geolocated at $_location"
} }
function start_vnc { function start_vnc {