From 98ee5667e41b7464c14aa18557737df9a48d219e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= <daniel@dodsorf.as>
Date: Mon, 20 Apr 2020 16:04:09 +0200
Subject: [PATCH] add distro agnostic client

Former-commit-id: 480dcbe66060e90a38580c9eb5a2fba8c14d8768
---
 src/main.rs                         | 4 ++--
 src/static/av1client.REMOVED.git-id | 1 +
 src/static/client.sh                | 5 ++---
 3 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 src/static/av1client.REMOVED.git-id

diff --git a/src/main.rs b/src/main.rs
index f079832..9c6d405 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -29,8 +29,8 @@ struct SharedState {
 #[get("/")]
 fn index() -> String {
 format!("Wecome to the AV1Master Server version {version}\n
-This currently requires a working <a href=\"https://nixos.org/nix/\">nix</a> installion\n
-curl -L {baseurl}/client.sh > client.sh && chmod +x ./client.sh && ./client.sh {baseurl}", version=VERSION, baseurl="https://av1.dodsorf.as")
+This currently requires a distro with CAP_SYS_USER_NS enabled and correct permissions
+curl -L {baseurl}/client.sh > client.sh && chmod +x ./av1client && ./av1client {baseurl}", version=VERSION, baseurl="https://av1.dodsorf.as")
 }
 
 #[get("/version")]
diff --git a/src/static/av1client.REMOVED.git-id b/src/static/av1client.REMOVED.git-id
new file mode 100644
index 0000000..9777b13
--- /dev/null
+++ b/src/static/av1client.REMOVED.git-id
@@ -0,0 +1 @@
+90d35de41aad83f4f5eb6eac0930c4bdb1401735
\ No newline at end of file
diff --git a/src/static/client.sh b/src/static/client.sh
index af740d9..80a6320 100644
--- a/src/static/client.sh
+++ b/src/static/client.sh
@@ -1,5 +1,4 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p bash curl jq libaom ffmpeg-full
+#! /usr/bin/env bash
 
 set -euo pipefail
 IFS=$'\n\t'
@@ -10,7 +9,7 @@ version="0.5.0"
 while true; do
     sleep 30
     set +e
-    upstream_version=`curl -s "$base_url"/version`
+    upstream_version=`curl -L -f -s "$base_url"/version`
     retval=$?
     set -e
     if [ $retval -ne 0 ]; then