Fix package generation when building with the scripts

LizardByte · Oct 5, 2021 · e4c9c29 · e4c9c29
1 parent fe7a7f4
commit e4c9c29
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/gen-deb.in b/gen-deb.in
@@ -37,7 +37,7 @@ Package: sunshine
 Architecture: amd64
 Maintainer: @loki
 Priority: optional
-Version: 0.11.0
+Version: 0.11.1
 Depends: libssl1.1, libavdevice58, libboost-thread1.67.0 | libboost-thread1.71.0 | libboost-thread1.74.0, libboost-filesystem1.67.0 | libboost-filesystem1.71.0 | libboost-filesystem1.74.0, libboost-log1.67.0 | libboost-log1.71.0 | libboost-log1.74.0, libpulse0, libopus0, libxcb-shm0, libxcb-xfixes0, libxtst6, libevdev2, libdrm2, libcap2
 Description: Gamestream host for Moonlight
 EOF

diff --git a/scripts/build-container.sh b/scripts/build-container.sh
@@ -7,6 +7,7 @@ usage() {
 	echo "	  | build   --> Build the container, Dockerfile is mandatory"
 	echo "	  | compile --> Builds the container, then compiles it. Dockerfile is mandatory"
 	echo ""
+	echo "  -s: path: The path to the source for compilation"
 	echo "	-n: name: Docker container name --> default [sunshine]"
 	echo "	  --> all: Build/Compile/Delete all available docker containers"
 	echo "	-f: Dockerfile: The name of the docker file"
@@ -113,25 +114,28 @@ compile() {
 		do
 			CURRENT_CONTAINER="sunshine-$(echo $file | cut -c 14-)"
 
-			echo "$PWD/build-sunshine.sh -p -n $CURRENT_CONTAINER"
-			"$PWD/build-sunshine.sh" -p -n "$CURRENT_CONTAINER"
+			echo "$PWD/build-sunshine.sh -p -n $CURRENT_CONTAINER $SUNSHINE_SOURCES"
+			"$PWD/build-sunshine.sh" -p -n "$CURRENT_CONTAINER" $SUNSHINE_SOURCES
 		done
 		shopt -u nullglob #revert nullglob back to it's normal default state
 	else
 		# If container exists
-		if docker inspect "$CURRENT_CONTAINER" > /dev/null 2> /dev/null
+		if docker inspect "$CONTAINER_NAME" > /dev/null 2> /dev/null
 		then
-			echo "$PWD/build-sunshine.sh -p -n $CONTAINER_NAME"
-			"$PWD/build-sunshine.sh" -p -n "$CONTAINER_NAME"
+			echo "$PWD/build-sunshine.sh -p -n $CONTAINER_NAME $SUNSHINE_SOURCES"
+			"$PWD/build-sunshine.sh" -p -n "$CONTAINER_NAME" $SUNSHINE_SOURCES
 		else
 			echo "Error: container image [$CONTAINER_NAME] doesn't exist"
 			exit 9
 		fi
 	fi
 }
 
-while getopts ":c:hn:f:" arg; do
+while getopts ":c:hn:f:s:" arg; do
 	case ${arg} in
+		s)
+			SUNSHINE_SOURCES="-s $OPTARG"
+			;;
 		c)
 			COMMAND=$(echo $OPTARG | tr '[:lower:]' '[:upper:]')
 			;;

diff --git a/scripts/build-sunshine.sh b/scripts/build-sunshine.sh
@@ -84,9 +84,10 @@ done
 [ "$USERNAME" = "" ] && USERNAME=$(logname)
 
 BUILD_DIR="$PWD/$CONTAINER_NAME-build"
-SUNSHINE_ASSETS_DIR="-e SUNSHINE_ASSETS_DIR=$BUILD_DIR/assets"
-SUNSHINE_EXECUTABLE_PATH="-e SUNSHINE_EXECUTABLE_PATH=$BUILD_DIR/sunshine"
+[ "$SUNSHINE_ASSETS_DIR" = "" ] &&  SUNSHINE_ASSETS_DIR="-e SUNSHINE_ASSETS_DIR=$BUILD_DIR/assets"
+[ "$SUNSHINE_EXECUTABLE_PATH" = "" ] && SUNSHINE_EXECUTABLE_PATH="-e SUNSHINE_EXECUTABLE_PATH=$BUILD_DIR/sunshine"
 
+echo "docker run $DOCKER_INTERACTIVE --privileged $SUNSHINE_ROOT $CMAKE_ROOT $SUNSHINE_ASSETS_DIR $SUNSHINE_EXECUTABLE_PATH $CMAKE_BUILD_TYPE --name $CONTAINER_NAME $CONTAINER_NAME"
 docker run $DOCKER_INTERACTIVE --privileged $SUNSHINE_ROOT $CMAKE_ROOT $SUNSHINE_ASSETS_DIR $SUNSHINE_EXECUTABLE_PATH $CMAKE_BUILD_TYPE --name $CONTAINER_NAME $CONTAINER_NAME
 
 exit_code=$?