Fix various issues with the split libs scripts
This commit is contained in:
parent
414548163c
commit
2e3a231a30
|
|
@ -83,7 +83,7 @@ fi
|
|||
if [ -z "$binary_path_arg" ]
|
||||
then
|
||||
# download and unzip the binary
|
||||
binary_path_arg = "$FILE_NAME"
|
||||
binary_path_arg="$FILE_NAME"
|
||||
echo "Downloading to: ${tmp_dir}/$binary_path_arg"
|
||||
|
||||
curl -L "$binary_download_url" > "$binary_path_arg"
|
||||
|
|
@ -94,9 +94,9 @@ fi
|
|||
echo "Extracting to: ${tmp_dir}/breezy_gnome"
|
||||
tar -xf $(basename $binary_path_arg)
|
||||
|
||||
if [ -z "lib_path_arg" ]
|
||||
if [ -z "$lib_path_arg" ]
|
||||
then
|
||||
lib_path_arg = "$FILE_NAME"
|
||||
lib_path_arg="$LIBS_FILE_NAME"
|
||||
echo "Downloading to: ${tmp_dir}/$lib_path_arg"
|
||||
|
||||
curl -L "$libs_download_url" > "$lib_path_arg"
|
||||
|
|
|
|||
|
|
@ -175,24 +175,9 @@ then
|
|||
exit $pkgkwin_rc
|
||||
fi
|
||||
FILE_NAME="breezyKWin-$ARCH.tar.gz"
|
||||
cp "out/$FILE_NAME" "$tmp_dir"
|
||||
binary_path_arg="$FILE_NAME"
|
||||
cp "out/$binary_path_arg" "$tmp_dir"
|
||||
popd > /dev/null
|
||||
|
||||
# For source builds, we may not have a published Breezy libs artifact.
|
||||
# Fetch the XR driver libs directly and wrap them in the expected Breezy libs archive format.
|
||||
xr_libs_url="https://github.com/wheaney/XRLinuxDriver/releases/latest/download/xrDriver-libs-$LIBS_ARCH.tar.gz"
|
||||
echo "Downloading to: ${tmp_dir}/xrDriver-libs-$LIBS_ARCH.tar.gz"
|
||||
curl -L "$xr_libs_url" -o "${tmp_dir}/xrDriver-libs-$LIBS_ARCH.tar.gz"
|
||||
|
||||
tmp_lib_dir=$(mktemp -d -t breezy-kwin-libs-XXXXXXXXXX)
|
||||
mkdir -p "$tmp_lib_dir/breezy_desktop_lib"
|
||||
mv "${tmp_dir}/xrDriver-libs-$LIBS_ARCH.tar.gz" "$tmp_lib_dir/breezy_desktop_lib/"
|
||||
echo "Creating ${tmp_dir}/$LIBS_FILE_NAME"
|
||||
tar -zcvf "${tmp_dir}/$LIBS_FILE_NAME" -C "$tmp_lib_dir" "breezy_desktop_lib" > /dev/null
|
||||
rm -rf "$tmp_lib_dir"
|
||||
|
||||
lib_path_arg="$LIBS_FILE_NAME"
|
||||
fi
|
||||
else
|
||||
cp "$binary_path_arg" "$tmp_dir"
|
||||
|
|
@ -200,9 +185,10 @@ fi
|
|||
|
||||
if [ -z "$lib_path_arg" ]
|
||||
then
|
||||
echo "Downloading to: ${tmp_dir}/$LIBS_FILE_NAME"
|
||||
curl -L "$libs_download_url" -o "$LIBS_FILE_NAME"
|
||||
lib_path_arg="$LIBS_FILE_NAME"
|
||||
echo "Downloading to: ${tmp_dir}/$lib_path_arg"
|
||||
|
||||
curl -L "$libs_download_url" -o "$lib_path_arg"
|
||||
else
|
||||
cp "$lib_path_arg" "$tmp_dir"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -31,9 +31,11 @@ copy_and_inject_ua "$XR_DRIVER_DIR/bin/ua.sh" "$PACKAGE_DIR/bin" "$KWIN_DIR/bin/
|
|||
|
||||
XR_DRIVER_BINARY_NAME=xrDriver-$ARCH.tar.gz
|
||||
XR_DRIVER_BINARY="$XR_DRIVER_DIR/out/$XR_DRIVER_BINARY_NAME"
|
||||
|
||||
XR_DRIVER_VERSION=$(sed -nE 's/^project\([^)]*VERSION[[:space:]]+([0-9]+\.[0-9]+\.[0-9]+).*$/\1/p' "$XR_DRIVER_DIR/CMakeLists.txt" | head -n 1)
|
||||
if [ "$1" == "--download-driver" ]; then
|
||||
driver_download_url="https://github.com/wheaney/XRLinuxDriver/releases/latest/download/xrDriver-$ARCH.tar.gz"
|
||||
setup_download_url="https://github.com/wheaney/XRLinuxDriver/releases/latest/download/xr_driver_setup"
|
||||
driver_download_url="https://github.com/wheaney/XRLinuxDriver/releases/download/v$XR_DRIVER_VERSION/xrDriver-$ARCH.tar.gz"
|
||||
setup_download_url="https://github.com/wheaney/XRLinuxDriver/releases/download/v$XR_DRIVER_VERSION/xr_driver_setup"
|
||||
|
||||
curl -L "$driver_download_url" > "$PACKAGE_DIR/$XR_DRIVER_BINARY_NAME"
|
||||
curl -L "$setup_download_url" > "$PACKAGE_DIR/bin/xr_driver_setup"
|
||||
|
|
|
|||
Loading…
Reference in New Issue