Merge branch 'master' of https://git.dodsorf.as/Dandellion/av1master

Former-commit-id: 1e4105b1676642d1147336ac322ae031050f737e

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
+This currently requires a distro with CAP_SYS_USER_NS enabled and correct permissions
-curl -L {baseurl}/client.sh > client.sh && chmod +x ./client.sh && ./client.sh {baseurl}", version=VERSION, baseurl="https://av1.dodsorf.as")
+curl -L {baseurl}/client.sh > client.sh && chmod +x ./av1client && ./av1client {baseurl}", version=VERSION, baseurl="https://av1.dodsorf.as")
 }
 
 #[get("/version")]

src/static/av1client.REMOVED.git-id

@@ -0,0 +1 @@
+90d35de41aad83f4f5eb6eac0930c4bdb1401735

src/static/client.sh

@@ -1,23 +1,22 @@
-#! /usr/bin/env nix-shell
+#! /usr/bin/env bash
-#! nix-shell -i bash -p bash curl jq libaom ffmpeg-full
 
 set -euo pipefail
 IFS=$'\n\t'
 
 base_url="$1"
-version="0.4.0"
+version="0.5.0"
 
 while true; do
     sleep 30
     set +e
-    upsteam_version=`curl -s "$base_url"/version`
+    upstream_version=`curl -L -f -s "$base_url"/version`
     retval=$?
     set -e
     if [ $retval -ne 0 ]; then
         echo "Is the Job Server Down?"
         continue
     fi
-    if [[ $version != $upsteam_version ]]; then
+    if [[ $version != $upstream_version ]]; then
         echo "Wrong version: client version is $version, while job server requires $upstream_version"
         break
     fi