diff --git a/.gitignore b/.gitignore index e69de29..a5c1784 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,2 @@ +diffs +build_logs \ No newline at end of file diff --git a/build.sh b/build.sh index 5981132..ca24c8c 100755 --- a/build.sh +++ b/build.sh @@ -14,9 +14,9 @@ prepare_build() { build_binary() { local os=$1 local arch=$2 - local output_main="dist/${os}_${arch}_main" - local output_filter="dist/${os}_${arch}_filter" - local output_api="dist/${os}_${arch}_api" + local output_main="dist/${PROJECT_NAME}_${os}_${arch}_main" + local output_filter="dist/${PROJECT_NAME}_${os}_${arch}_filter" + local output_api="dist/${PROJECT_NAME}_${os}_${arch}_api" env GOOS=$os GOARCH=$arch go build -o $output_main main.go &> "build_logs/${os}_${arch}_main.log" if [ $? -ne 0 ]; then diff --git a/dist/oculus_darwin_amd64_api b/dist/oculus_darwin_amd64_api new file mode 100755 index 0000000..9c8a042 Binary files /dev/null and b/dist/oculus_darwin_amd64_api differ diff --git a/dist/oculus_darwin_amd64_filter b/dist/oculus_darwin_amd64_filter new file mode 100755 index 0000000..ecba7ad Binary files /dev/null and b/dist/oculus_darwin_amd64_filter differ diff --git a/dist/oculus_darwin_amd64_main b/dist/oculus_darwin_amd64_main new file mode 100755 index 0000000..c38b89c Binary files /dev/null and b/dist/oculus_darwin_amd64_main differ diff --git a/dist/oculus_darwin_arm64_api b/dist/oculus_darwin_arm64_api new file mode 100755 index 0000000..5eecce0 Binary files /dev/null and b/dist/oculus_darwin_arm64_api differ diff --git a/dist/oculus_darwin_arm64_filter b/dist/oculus_darwin_arm64_filter new file mode 100755 index 0000000..b3bd419 Binary files /dev/null and b/dist/oculus_darwin_arm64_filter differ diff --git a/dist/oculus_darwin_arm64_main b/dist/oculus_darwin_arm64_main new file mode 100755 index 0000000..8935d37 Binary files /dev/null and b/dist/oculus_darwin_arm64_main differ diff --git a/dist/oculus_linux_amd64_api b/dist/oculus_linux_amd64_api new file mode 100755 index 0000000..47125f4 Binary files /dev/null and b/dist/oculus_linux_amd64_api differ diff --git a/dist/oculus_linux_amd64_api_static b/dist/oculus_linux_amd64_api_static new file mode 100755 index 0000000..feb3b1b Binary files /dev/null and b/dist/oculus_linux_amd64_api_static differ diff --git a/dist/oculus_linux_amd64_filter b/dist/oculus_linux_amd64_filter new file mode 100755 index 0000000..ab4814e Binary files /dev/null and b/dist/oculus_linux_amd64_filter differ diff --git a/dist/oculus_linux_amd64_filter_static b/dist/oculus_linux_amd64_filter_static new file mode 100755 index 0000000..d0c61e0 Binary files /dev/null and b/dist/oculus_linux_amd64_filter_static differ diff --git a/dist/oculus_linux_amd64_main b/dist/oculus_linux_amd64_main new file mode 100755 index 0000000..5104047 Binary files /dev/null and b/dist/oculus_linux_amd64_main differ diff --git a/dist/oculus_linux_amd64_main_static b/dist/oculus_linux_amd64_main_static new file mode 100755 index 0000000..a9198e3 Binary files /dev/null and b/dist/oculus_linux_amd64_main_static differ diff --git a/dist/oculus_linux_arm64_api b/dist/oculus_linux_arm64_api new file mode 100755 index 0000000..3c4d5e6 Binary files /dev/null and b/dist/oculus_linux_arm64_api differ diff --git a/dist/oculus_linux_arm64_api_static b/dist/oculus_linux_arm64_api_static new file mode 100755 index 0000000..cb10f7b Binary files /dev/null and b/dist/oculus_linux_arm64_api_static differ diff --git a/dist/oculus_linux_arm64_filter b/dist/oculus_linux_arm64_filter new file mode 100755 index 0000000..22eed99 Binary files /dev/null and b/dist/oculus_linux_arm64_filter differ diff --git a/dist/oculus_linux_arm64_filter_static b/dist/oculus_linux_arm64_filter_static new file mode 100755 index 0000000..9a36217 Binary files /dev/null and b/dist/oculus_linux_arm64_filter_static differ diff --git a/dist/oculus_linux_arm64_main b/dist/oculus_linux_arm64_main new file mode 100755 index 0000000..ebd8cc1 Binary files /dev/null and b/dist/oculus_linux_arm64_main differ diff --git a/dist/oculus_linux_arm64_main_static b/dist/oculus_linux_arm64_main_static new file mode 100755 index 0000000..4c16faf Binary files /dev/null and b/dist/oculus_linux_arm64_main_static differ diff --git a/dist/oculus_windows_amd64_api b/dist/oculus_windows_amd64_api new file mode 100755 index 0000000..0754feb Binary files /dev/null and b/dist/oculus_windows_amd64_api differ diff --git a/dist/oculus_windows_amd64_filter b/dist/oculus_windows_amd64_filter new file mode 100755 index 0000000..ff72919 Binary files /dev/null and b/dist/oculus_windows_amd64_filter differ diff --git a/dist/oculus_windows_amd64_main b/dist/oculus_windows_amd64_main new file mode 100755 index 0000000..4b631dd Binary files /dev/null and b/dist/oculus_windows_amd64_main differ diff --git a/install.sh b/install.sh index 84006bc..17c6d4b 100644 --- a/install.sh +++ b/install.sh @@ -1,7 +1,7 @@ #!/bin/bash INSTALL_DIR="/usr/local/bin" -BINARY_NAME="oculus" +PROJECT_NAME=$(basename "$(pwd)") BASE_URL="https://git.nixc.us/colin/Oculus/raw/branch/main/dist" # Supported architectures @@ -17,17 +17,21 @@ case $ARCH in *) echo "Unsupported architecture: $ARCH"; exit 1 ;; esac -BINARY_URL="${BASE_URL}/oculus_${OS}_${ARCH}" +COMPONENTS=("filter" "api" "main") -echo "Downloading and installing $BINARY_NAME from $BINARY_URL..." +for COMPONENT in "${COMPONENTS[@]}"; do + BINARY_NAME="${PROJECT_NAME}_${COMPONENT}" + BINARY_URL="${BASE_URL}/${PROJECT_NAME}_${OS}_${ARCH}_${COMPONENT}" + echo "Downloading and installing $BINARY_NAME from $BINARY_URL..." -# Check if we have write permission to the install directory -if [ -w "${INSTALL_DIR}" ]; then - curl -sSL "$BINARY_URL" -o "${INSTALL_DIR}/${BINARY_NAME}" - chmod +x "${INSTALL_DIR}/${BINARY_NAME}" -else - sudo curl -sSL "$BINARY_URL" -o "${INSTALL_DIR}/${BINARY_NAME}" - sudo chmod +x "${INSTALL_DIR}/${BINARY_NAME}" -fi + # Check if we have write permission to the install directory + if [ -w "${INSTALL_DIR}" ]; then + curl -sSL "$BINARY_URL" -o "${INSTALL_DIR}/${BINARY_NAME}" + chmod +x "${INSTALL_DIR}/${BINARY_NAME}" + else + sudo curl -sSL "$BINARY_URL" -o "${INSTALL_DIR}/${BINARY_NAME}" + sudo chmod +x "${INSTALL_DIR}/${BINARY_NAME}" + fi -echo "Installed $BINARY_NAME to $INSTALL_DIR" + echo "Installed $BINARY_NAME to $INSTALL_DIR" +done