Unverified Commit ba478700 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

feat: Update version file path (#1749)

parent 6e45deea

Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ FROM dockurr/windows-arm:${VERSION_ARG} AS build-arm64 
FROM build-${TARGETARCH}



ARG VERSION_ARG="0.00"

RUN echo "$VERSION_ARG" > /run/version

RUN echo "$VERSION_ARG" > /etc/version



VOLUME /storage

EXPOSE 3389 8006

src/install.sh

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ finishInstall() { 
  fi



  local file="$STORAGE/windows.ver"

  cp -f /run/version "$file"

  cp -f /etc/version "$file"

  ! setOwner "$file" && error "Failed to set the owner for \"$file\" !"



  if [[ "$iso" == "$STORAGE/"* ]]; then

src/mido.sh

+5 −3
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ download_windows() { 
  local id="$1"

  local lang="$2"

  local desc="$3"

  local ovw="" rtick="" sku_id="" sku_url=""

  local ovw="" rtick="" mdt="" sku_id="" sku_url=""

  local iso_url="" iso_json="" language="" org_id=""

  local instance_id="" vls_url="" ov_url="" ov_data=""

  local session_id="" user_agent="" download_type=""
@@ -82,7 +82,6 @@ download_windows() { 
  esac



  local url="https://www.microsoft.com/en-us/software-download/windows$windows_version"

  [[ "${id,,}" == "win10"* ]] && url+="ISO"



  # uuidgen: For MacOS (installed by default) and other systems (e.g. with no /proc) that don't have a kernel interface for generating random UUIDs

  session_id=$(cat /proc/sys/kernel/random/uuid 2> /dev/null || uuidgen --random)
@@ -188,7 +187,10 @@ download_windows() { 
  # If any request is going to be blocked by Microsoft it's always this last one (the previous requests always seem to succeed)



  iso_url="https://www.microsoft.com/software-download-connector/api/GetProductDownloadLinksBySku?profile=$profile&ProductEditionId=undefined&SKU=$sku_id&friendlyFileName=undefined&Locale=en-US&sessionID=$session_id"

  iso_json=$(curl --silent --max-time 30 --request GET --user-agent "$user_agent" --referer "$url" --header "Accept:" --max-filesize 100K --fail --proto =https --tlsv1.2 --http1.1 -- "$iso_url")

  iso_json=$(curl --silent --max-time 30 --request GET --user-agent "$user_agent" --referer "$url" --header "Accept:" --max-filesize 100K --fail --proto =https --tlsv1.2 --http1.1 -- "$iso_url") || {

    handle_curl_error "$?" "Microsoft"

    return $?

  }



  if ! [ "$iso_json" ]; then

    # This should only happen if there's been some change to how this API works

src/samba.sh

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ addShare() { 
  if [[ "$dir" == "$tmp" ]]; then



    {   echo "--------------------------------------------------------"

        echo " $APP for $ENGINE v$(</run/version)..."

        echo " $APP for $ENGINE v$(</etc/version)..."

        echo " For support visit $SUPPORT"

        echo "--------------------------------------------------------"

        echo ""