← back to Exo
shfmt
b1e88a3d06ee61c22f705476402cfd37513d4dfb · 2026-01-29 14:59:16 +0000 · Evan
adds shfmt, a shell formatter, and formats the bash files
Files touched
M app/EXO/uninstall-exo.shM flake.nixM tests/start_distributed_test.shM tmp/set_rdma_network_config.sh
Diff
commit b1e88a3d06ee61c22f705476402cfd37513d4dfb
Author: Evan <evanev7@gmail.com>
Date: Thu Jan 29 14:59:16 2026 +0000
shfmt
adds shfmt, a shell formatter, and formats the bash files
---
app/EXO/uninstall-exo.sh | 77 ++++++++++++++++++++---------------------
flake.nix | 1 +
tests/start_distributed_test.sh | 10 +++---
tmp/set_rdma_network_config.sh | 44 +++++++++++------------
4 files changed, 64 insertions(+), 68 deletions(-)
diff --git a/app/EXO/uninstall-exo.sh b/app/EXO/uninstall-exo.sh
index 7cc60925..c51f33a4 100755
--- a/app/EXO/uninstall-exo.sh
+++ b/app/EXO/uninstall-exo.sh
@@ -29,21 +29,21 @@ YELLOW='\033[1;33m'
NC='\033[0m' # No Color
echo_info() {
- echo -e "${GREEN}[INFO]${NC} $1"
+ echo -e "${GREEN}[INFO]${NC} $1"
}
echo_warn() {
- echo -e "${YELLOW}[WARN]${NC} $1"
+ echo -e "${YELLOW}[WARN]${NC} $1"
}
echo_error() {
- echo -e "${RED}[ERROR]${NC} $1"
+ echo -e "${RED}[ERROR]${NC} $1"
}
# Check if running as root
if [[ $EUID -ne 0 ]]; then
- echo_error "This script must be run as root (use sudo)"
- exit 1
+ echo_error "This script must be run as root (use sudo)"
+ exit 1
fi
echo ""
@@ -55,64 +55,64 @@ echo ""
# Unload the LaunchDaemon if running
echo_info "Stopping network setup daemon..."
if launchctl list | grep -q "$LABEL"; then
- launchctl bootout system/"$LABEL" 2>/dev/null || true
- echo_info "Daemon stopped"
+ launchctl bootout system/"$LABEL" 2>/dev/null || true
+ echo_info "Daemon stopped"
else
- echo_warn "Daemon was not running"
+ echo_warn "Daemon was not running"
fi
# Remove LaunchDaemon plist
-if [[ -f "$PLIST_DEST" ]]; then
- rm -f "$PLIST_DEST"
- echo_info "Removed LaunchDaemon plist"
+if [[ -f $PLIST_DEST ]]; then
+ rm -f "$PLIST_DEST"
+ echo_info "Removed LaunchDaemon plist"
else
- echo_warn "LaunchDaemon plist not found (already removed?)"
+ echo_warn "LaunchDaemon plist not found (already removed?)"
fi
# Remove the script and parent directory
-if [[ -f "$SCRIPT_DEST" ]]; then
- rm -f "$SCRIPT_DEST"
- echo_info "Removed network setup script"
+if [[ -f $SCRIPT_DEST ]]; then
+ rm -f "$SCRIPT_DEST"
+ echo_info "Removed network setup script"
else
- echo_warn "Network setup script not found (already removed?)"
+ echo_warn "Network setup script not found (already removed?)"
fi
# Remove EXO directory if empty
if [[ -d "/Library/Application Support/EXO" ]]; then
- rmdir "/Library/Application Support/EXO" 2>/dev/null && \
- echo_info "Removed EXO support directory" || \
- echo_warn "EXO support directory not empty, leaving in place"
+ rmdir "/Library/Application Support/EXO" 2>/dev/null &&
+ echo_info "Removed EXO support directory" ||
+ echo_warn "EXO support directory not empty, leaving in place"
fi
# Remove log files
-if [[ -f "$LOG_OUT" ]] || [[ -f "$LOG_ERR" ]]; then
- rm -f "$LOG_OUT" "$LOG_ERR"
- echo_info "Removed log files"
+if [[ -f $LOG_OUT ]] || [[ -f $LOG_ERR ]]; then
+ rm -f "$LOG_OUT" "$LOG_ERR"
+ echo_info "Removed log files"
else
- echo_warn "Log files not found (already removed?)"
+ echo_warn "Log files not found (already removed?)"
fi
# Switch back to Automatic network location
echo_info "Restoring network configuration..."
if networksetup -listlocations | grep -q "^Automatic$"; then
- networksetup -switchtolocation Automatic 2>/dev/null || true
- echo_info "Switched to Automatic network location"
+ networksetup -switchtolocation Automatic 2>/dev/null || true
+ echo_info "Switched to Automatic network location"
else
- echo_warn "Automatic network location not found"
+ echo_warn "Automatic network location not found"
fi
# Delete the exo network location if it exists
if networksetup -listlocations | grep -q "^exo$"; then
- networksetup -deletelocation exo 2>/dev/null || true
- echo_info "Deleted 'exo' network location"
+ networksetup -deletelocation exo 2>/dev/null || true
+ echo_info "Deleted 'exo' network location"
else
- echo_warn "'exo' network location not found (already removed?)"
+ echo_warn "'exo' network location not found (already removed?)"
fi
# Re-enable Thunderbolt Bridge if it exists
if networksetup -listnetworkservices 2>/dev/null | grep -q "Thunderbolt Bridge"; then
- networksetup -setnetworkserviceenabled "Thunderbolt Bridge" on 2>/dev/null || true
- echo_info "Re-enabled Thunderbolt Bridge"
+ networksetup -setnetworkserviceenabled "Thunderbolt Bridge" on 2>/dev/null || true
+ echo_info "Re-enabled Thunderbolt Bridge"
fi
# Note about launch at login registration
@@ -124,14 +124,14 @@ echo_warn " System Settings → General → Login Items → Remove EXO"
# Check if EXO.app exists in common locations
APP_FOUND=false
for app_path in "/Applications/EXO.app" "$HOME/Applications/EXO.app"; do
- if [[ -d "$app_path" ]]; then
- if [[ "$APP_FOUND" == false ]]; then
- echo ""
- APP_FOUND=true
- fi
- echo_warn "EXO.app found at: $app_path"
- echo_warn "You may want to move it to Trash manually."
+ if [[ -d $app_path ]]; then
+ if [[ $APP_FOUND == false ]]; then
+ echo ""
+ APP_FOUND=true
fi
+ echo_warn "EXO.app found at: $app_path"
+ echo_warn "You may want to move it to Trash manually."
+ fi
done
echo ""
@@ -151,4 +151,3 @@ echo ""
echo "Manual step required:"
echo " Remove EXO from Login Items in System Settings → General → Login Items"
echo ""
-
diff --git a/flake.nix b/flake.nix
index 0d6d87b9..c7d60ab9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -84,6 +84,7 @@
enable = true;
package = pkgsSwift.swiftPackages.swift-format;
};
+ shfmt.enable = true;
};
};
diff --git a/tests/start_distributed_test.sh b/tests/start_distributed_test.sh
index 7130f1ff..52809da3 100755
--- a/tests/start_distributed_test.sh
+++ b/tests/start_distributed_test.sh
@@ -11,7 +11,6 @@ if [[ $# -lt 2 ]]; then
exit 1
fi
-
kind=$1
shift
@@ -31,14 +30,14 @@ for name in "${hostnames[@]}"; do
weaved+=("$name" "$ip")
done
-devs_raw=$(printf "[\"%s\", \"%s\"], " "${weaved[@]}")
+devs_raw=$(printf '["%s", "%s"], ' "${weaved[@]}")
devs="[${devs_raw%, }]"
model_ids=("qwen3-30b" "gpt-oss-120b-MXFP4-Q8" "kimi-k2-thinking")
for model_id in "${model_ids[@]}"; do
- for i in "${!ips[@]}"; do
- {
+ for i in "${!ips[@]}"; do
+ {
req="{
\"model_id\": \"${model_id}\",
\"devs\": ${devs},
@@ -48,9 +47,8 @@ for model_id in "${model_ids[@]}"; do
curl -sN \
-X POST "http://${ips[$i]}:52415/${kind}" \
-H "Content-Type: application/json" -d "$req" \
- 2>&1 | sed "s/^/\n${hostnames[$i]}@${ips[$i]}: /" || echo "curl to ${hostnames[$i]} failed" && exit 1
+ 2>&1 | sed "s/^/\n${hostnames[$i]}@${ips[$i]}: /" || echo "curl to ${hostnames[$i]} failed" && exit 1
} &
done
wait
done
-
diff --git a/tmp/set_rdma_network_config.sh b/tmp/set_rdma_network_config.sh
index e6a7f14d..3fd7f89d 100755
--- a/tmp/set_rdma_network_config.sh
+++ b/tmp/set_rdma_network_config.sh
@@ -20,29 +20,27 @@ networksetup -listlocations | grep -q exo || {
}
networksetup -switchtolocation exo
-networksetup -listallhardwareports \
- | awk -F': ' '/Hardware Port: / {print $2}' \
- | while IFS=":" read -r name; do
- case "$name" in
- "Ethernet Adapter"*)
- ;;
- "Thunderbolt Bridge")
- ;;
- "Thunderbolt "*)
- networksetup -listallnetworkservices \
- | grep -q "EXO $name" \
- || networksetup -createnetworkservice "EXO $name" "$name" 2>/dev/null \
- || continue
- networksetup -setdhcp "EXO $name"
- ;;
- *)
- networksetup -listallnetworkservices \
- | grep -q "$name" \
- || networksetup -createnetworkservice "$name" "$name" 2>/dev/null \
- || continue
- ;;
- esac
- done
+networksetup -listallhardwareports |
+ awk -F': ' '/Hardware Port: / {print $2}' |
+ while IFS=":" read -r name; do
+ case "$name" in
+ "Ethernet Adapter"*) ;;
+ "Thunderbolt Bridge") ;;
+ "Thunderbolt "*)
+ networksetup -listallnetworkservices |
+ grep -q "EXO $name" ||
+ networksetup -createnetworkservice "EXO $name" "$name" 2>/dev/null ||
+ continue
+ networksetup -setdhcp "EXO $name"
+ ;;
+ *)
+ networksetup -listallnetworkservices |
+ grep -q "$name" ||
+ networksetup -createnetworkservice "$name" "$name" 2>/dev/null ||
+ continue
+ ;;
+ esac
+ done
networksetup -listnetworkservices | grep -q "Thunderbolt Bridge" && {
networksetup -setnetworkserviceenabled "Thunderbolt Bridge" off
← ebeddfb3 mlx: build with Nix (#1285)
·
back to Exo
·
nix: add Python packaging with uv2nix e4c6a7db →