diff --git a/bin/breezy_vulkan_setup b/bin/breezy_vulkan_setup index 7a46030..637034b 100755 --- a/bin/breezy_vulkan_setup +++ b/bin/breezy_vulkan_setup @@ -19,17 +19,27 @@ tmp_dir=$(mktemp -d -t breezy-vulkan-XXXXXXXXXX) pushd $tmp_dir > /dev/null echo "Created temp directory: ${tmp_dir}" -if [ -z "$1" ] +# if the first argument is "-v" then the second argument is metrics version, and the third argument is binary path +# otherwise, if the first argument is present, it's the binary path +if [ "$1" = "-v" ] +then + metrics_version="$2" + binary_path_arg="$3" +else + binary_path_arg="$1" +fi + +if [ -z "$binary_path_arg" ] then # download and unzip the latest driver echo "Downloading latest release to: ${tmp_dir}/breezyVulkan.tar.gz" curl -L -O https://github.com/wheaney/breezy-desktop/releases/latest/download/breezyVulkan.tar.gz else - if [[ "$1" = /* ]]; then - abs_path="$1" + if [[ "$binary_path_arg" = /* ]]; then + abs_path="$binary_path_arg" else # Convert relative path to absolute path - abs_path=$(realpath "$start_dir/$1") + abs_path=$(realpath "$start_dir/$binary_path_arg") fi cp $abs_path $tmp_dir fi @@ -40,7 +50,7 @@ tar -xf breezyVulkan.tar.gz pushd breezy_vulkan > /dev/null # run the setup script that comes with this release -bin/setup +bin/setup $metrics_version echo "Deleting temp directory: ${tmp_dir}" rm -rf $tmp_dir diff --git a/modules/xrealAirLinuxDriver b/modules/xrealAirLinuxDriver index 7456382..0df917d 160000 --- a/modules/xrealAirLinuxDriver +++ b/modules/xrealAirLinuxDriver @@ -1 +1 @@ -Subproject commit 74563823dc6b2d9727986b9cc98249ae8c070521 +Subproject commit 0df917d0fa0813512634aab06a343963d869a2a0 diff --git a/vulkan/bin/setup b/vulkan/bin/setup index 0f1ae19..2264802 100755 --- a/vulkan/bin/setup +++ b/vulkan/bin/setup @@ -18,6 +18,7 @@ if [ -e "$USER_HOME/bin/breezy_vulkan_uninstall" ]; then fi UA_CLIENT_ID="BreezyVulkan" +UA_EVENT_VERSION="$1" #INJECT_UA_CALL echo "Copying the breezy_vulkan scripts to ${USER_HOME}/bin" @@ -62,5 +63,10 @@ chown -R $USER:$USER $USER_HOME/.config/reshade # set up the XREAL driver using the local binary echo "Installing xrealAirLinuxDriver" echo "BEGIN - xreal_driver_setup" -bin/xreal_driver_setup $(pwd)/xrealAirLinuxDriver.tar.gz +if [ -z "$1" ] +then + bin/xreal_driver_setup $(pwd)/xrealAirLinuxDriver.tar.gz +else + bin/xreal_driver_setup -v $1 $(pwd)/xrealAirLinuxDriver.tar.gz +fi echo "END - xreal_driver_setup" \ No newline at end of file