Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update install.sh #832

Merged
merged 2 commits into from Jun 10, 2023
Merged

Update install.sh #832

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7c567c
Update install.sh
joonkyu Apr 30, 2023
4b0e449
Update install.sh
joonkyu Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 12 additions & 12 deletions install.sh
View file
Open in desktop
Expand Up @@ -120,7 +120,7 @@ configure() {
# Use profile from now on
add_arg profile "$(get_profile_id)"

doc "Sending your devices name lets you filter analytics and logs by device."
doc "Sending your device's name lets you filter analytics and logs by device."
joonkyu marked this conversation as resolved.
Show resolved Hide resolved
add_arg_bool_ask report-client-info 'Report device name?' true

case $(guess_host_type) in
Expand All @@ -138,7 +138,7 @@ configure() {
;;
esac

doc "Make nextdns CLI cache responses. This improves latency and reduces the amount"
doc "Make NextDNS CLI cache responses. This improves latency and reduces the amount"
doc "of queries sent to NextDNS."
if [ "$(guess_host_type)" = "router" ]; then
doc "Note that enabling this feature will disable dnsmasq for DNS to avoid double"
Expand All @@ -162,7 +162,7 @@ configure() {
fi

if [ "$(guess_host_type)" != "router" ]; then
doc "Changes DNS settings of the host automatically when nextdns is started."
doc "Changes DNS settings of the host automatically when NextDNS is started."
doc "If you say no here, you will have to manually configure DNS to 127.0.0.1."
add_arg_bool_ask auto-activate 'Automatically setup local host DNS?' true
fi
Expand All @@ -176,8 +176,8 @@ post_install() {
println
println "To upgrade/uninstall, run this command again and select the approriate option."
println
println "You can use the nextdns command to control the daemon."
println "Here is a few important commands to know:"
println "You can use the NextDNS command to control the daemon."
println "Here are a few important commands to know:"
println
println "# Start, stop, restart the daemon:"
println "nextdns start"
Expand Down Expand Up @@ -774,16 +774,16 @@ ask_bool() {

detect_endiannes() {
if ! hexdump /dev/null 2>/dev/null; then
# Some firmware do not contain hexdump, for those, try to detect endiannes
# differently
# Some firmwares do not contain hexdump, for those, try to detect endianness
# differently.
case $(cat /proc/cpuinfo) in
*BCM5300*)
# RT-AC66U does not support merlin version over 380.70 which
# lack hexdump command.
# RT-AC66U does not support Merlin version over 380.70 which
# lacks hexdump command.
echo "le"
;;
*)
log_error "Cannot determine endiannes"
log_error "Cannot determine endianness"
return 1
;;
esac
Expand Down Expand Up @@ -811,7 +811,7 @@ detect_goarch() {
echo "386"
;;
arm)
# Freebsd does not include arm version
# FreeBSD does not include arm version
case "$(sysctl -b hw.model 2>/dev/null)" in
*A9*)
echo "armv7"
Expand Down Expand Up @@ -982,7 +982,7 @@ guess_host_type() {
}

asroot() {
# Some platform (merlin) do not have the "id" command and $USER report a non root username with uid 0.
# Some platform (Merlin) do not have the "id" command and $USER report a non root username with uid 0.
if [ "$(grep '^Uid:' /proc/$$/status 2>/dev/null|cut -f2)" = "0" ] || [ "$USER" = "root" ] || [ "$(id -u 2>/dev/null)" = "0" ]; then
"$@"
elif [ "$(command -v sudo 2>/dev/null)" ]; then
Expand Down