浏览代码

Sudo fix for debian and fedora.

Erwin de Haan 6 年之前
父节点
当前提交
ca320ba7ac
共有 2 个文件被更改,包括 5 次插入10 次删除
  1. 3 5
      deployment/debian-package-x64/package.sh
  2. 2 5
      deployment/fedora-package-x64/package.sh

+ 3 - 5
deployment/debian-package-x64/package.sh

@@ -25,9 +25,7 @@ docker build ../.. -t "$image_name" -f ./Dockerfile --build-arg SOURCEDIR="/jell
 mkdir -p "$package_temporary_dir"
 mkdir -p "$package_temporary_dir"
 mkdir -p "$output_dir"
 mkdir -p "$output_dir"
 docker run --rm -v "$package_temporary_dir:/temp" "$image_name" sh -c 'find / -maxdepth 1 -type f -name "jellyfin*" -exec mv {} /temp \;'
 docker run --rm -v "$package_temporary_dir:/temp" "$image_name" sh -c 'find / -maxdepth 1 -type f -name "jellyfin*" -exec mv {} /temp \;'
-chown -R "$current_user" "$package_temporary_dir"
-if [ $? -ne 0 ]; then
-	# Some platforms need this to chown the file properly. (Platforms with native docker, not just the client)
-    sudo chown -R "$current_user" "$package_temporary_dir"
-fi
+chown -R "$current_user" "$package_temporary_dir" \
+|| sudo chown -R "$current_user" "$package_temporary_dir"
+
 mv "$package_temporary_dir"/* "$output_dir"
 mv "$package_temporary_dir"/* "$output_dir"

+ 2 - 5
deployment/fedora-package-x64/package.sh

@@ -78,9 +78,6 @@ fi
 docker build ../.. -t "$image_name" -f ./Dockerfile
 docker build ../.. -t "$image_name" -f ./Dockerfile
 mkdir -p "$output_dir"
 mkdir -p "$output_dir"
 docker run --rm -v "$package_temporary_dir:/temp" "$image_name" sh -c 'find /build/rpmbuild -maxdepth 3 -type f -name "jellyfin*.rpm" -exec mv {} /temp \;'
 docker run --rm -v "$package_temporary_dir:/temp" "$image_name" sh -c 'find /build/rpmbuild -maxdepth 3 -type f -name "jellyfin*.rpm" -exec mv {} /temp \;'
-chown -R "$current_user" "$package_temporary_dir"
-if [ $? -ne 0 ]; then
-	# Some platforms need this to chown the file properly. (Platforms with native docker, not just the client)
-    sudo chown -R "$current_user" "$package_temporary_dir"
-fi
+chown -R "$current_user" "$package_temporary_dir" \
+|| sudo chown -R "$current_user" "$package_temporary_dir"
 mv "$package_temporary_dir"/*.rpm "$output_dir"
 mv "$package_temporary_dir"/*.rpm "$output_dir"