Skip to content

Refactor: Add architecture detection function #12

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

Merged
SamNet-dev merged 1 commit into from
Mar 10, 2026
Merged

Refactor: Add architecture detection function #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 43 additions & 9 deletions dnstm-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,6 +906,34 @@ do_uninstall() {
echo ""
}

# ─── Architecture Detection ────────────────────────────────────────────────────

detect_architecture() {
# Detect system architecture using uname and map it to binary suffix
# Supports: 386, amd64, arm64, armv7
local machine_arch
machine_arch=$(uname -m)

case "$machine_arch" in
x86_64|amd64)
echo "amd64"
;;
i386|i686)
echo "386"
;;
aarch64|arm64)
echo "arm64"
;;
armv7l|armv7)
echo "armv7"
;;
*)
print_warn "Unsupported architecture: $machine_arch (defaulting to amd64)"
echo "amd64"
;;
esac
}

# ─── User Management TUI ──────────────────────────────────────────────────────

do_manage_users() {
Expand All @@ -921,11 +949,13 @@ do_manage_users() {
# Install sshtun-user if not present
if ! command -v sshtun-user &>/dev/null; then
print_info "sshtun-user not found. Installing..."
if curl -fsSL -o /usr/local/bin/sshtun-user https://github.com/net2share/sshtun-user/releases/latest/download/sshtun-user-linux-amd64; then
local arch
arch=$(detect_architecture)
if curl -fsSL -o /usr/local/bin/sshtun-user "https://github.com/net2share/sshtun-user/releases/latest/download/sshtun-user-linux-${arch}"; then
chmod +x /usr/local/bin/sshtun-user
print_ok "Downloaded sshtun-user"
print_ok "Downloaded sshtun-user for ${arch}"
else
print_fail "Failed to download sshtun-user. Check your internet connection."
print_fail "Failed to download sshtun-user for ${arch} architecture. Check your internet connection."
exit 1
fi

Expand Down Expand Up @@ -1360,11 +1390,13 @@ step_install_dnstm() {

# Download binary
print_info "Downloading dnstm..."
if curl -fsSL -o /usr/local/bin/dnstm https://github.com/net2share/dnstm/releases/latest/download/dnstm-linux-amd64; then
local arch
arch=$(detect_architecture)
if curl -fsSL -o /usr/local/bin/dnstm "https://github.com/net2share/dnstm/releases/latest/download/dnstm-linux-${arch}"; then
chmod +x /usr/local/bin/dnstm
print_ok "Downloaded dnstm binary"
print_ok "Downloaded dnstm binary for ${arch}"
else
print_fail "Failed to download dnstm"
print_fail "Failed to download dnstm for ${arch} architecture"
exit 1
fi

Expand Down Expand Up @@ -1772,11 +1804,13 @@ step_ssh_user() {
# Install sshtun-user if not present
if ! command -v sshtun-user &>/dev/null; then
print_info "Downloading sshtun-user..."
if curl -fsSL -o /usr/local/bin/sshtun-user https://github.com/net2share/sshtun-user/releases/latest/download/sshtun-user-linux-amd64; then
local arch
arch=$(detect_architecture)
if curl -fsSL -o /usr/local/bin/sshtun-user "https://github.com/net2share/sshtun-user/releases/latest/download/sshtun-user-linux-${arch}"; then
chmod +x /usr/local/bin/sshtun-user
print_ok "Downloaded sshtun-user"
print_ok "Downloaded sshtun-user for ${arch}"
else
print_fail "Failed to download sshtun-user"
print_fail "Failed to download sshtun-user for ${arch} architecture"
return
fi
else
Expand Down