Skip to content
This repository was archived by the owner on Jul 22, 2025. It is now read-only.

Commit 60d7ac3

Browse files
committed
Fix sudo
1 parent 2346729 commit 60d7ac3

File tree

4 files changed

+29
-9
lines changed

4 files changed

+29
-9
lines changed

WebRTC-Sample/owt-linux-player/build_webrtc_linux_client_sdk.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
#!/bin/bash -e
22

3+
SUDO=""
4+
if [[ $EUID -ne 0 ]]; then
5+
SUDO="sudo -E"
6+
fi
7+
38
ROOT=`pwd`/webrtc_linux_client_sdk
49
BUILD=${ROOT}/Build
510
PREFIX=${ROOT}/release
611
DEPS=${BUILD}/deps
712
PATCHES=${ROOT}/../patches
813

914
install_dependencies() {
10-
sudo -E apt-get update
11-
sudo -E apt install -y git build-essential wget python cmake pkg-config libglib2.0-dev libgtk-3-dev libasound2-dev libpulse-dev
15+
${SUDO} apt-get update
16+
${SUDO} apt install -y git build-essential wget python cmake pkg-config libglib2.0-dev libgtk-3-dev libasound2-dev libpulse-dev
1217

1318
# player
14-
sudo -E apt install -y yasm libgoogle-glog-dev libva-dev libglm-dev libglfw3-dev libgles2-mesa-dev libglu1-mesa-dev liblzma-dev
19+
${SUDO} apt install -y yasm libgoogle-glog-dev libva-dev libglm-dev libglfw3-dev libgles2-mesa-dev libglu1-mesa-dev liblzma-dev
1520

1621
# set git user
1722
if [ -z "`git config --get user.email`" ]; then
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
#!/bin/bash -e
22

3+
SUDO=""
4+
if [[ $EUID -ne 0 ]]; then
5+
SUDO="sudo -E"
6+
fi
7+
38
DIR=$(dirname $(readlink -f "$0"))
49
yml="$DIR/docker-compose.yml"
510

6-
sudo -E docker-compose -f "$yml" up ${1}
11+
${SUDO} docker-compose -f "$yml" up ${1}
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
#!/bin/bash -e
22

3+
SUDO=""
4+
if [[ $EUID -ne 0 ]]; then
5+
SUDO="sudo -E"
6+
fi
7+
38
DIR=$(dirname $(readlink -f "$0"))
49
yml="$DIR/docker-compose.yml"
510

6-
sudo -E docker-compose -f "$yml" down
11+
${SUDO} docker-compose -f "$yml" down
Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
#!/bin/bash -e
22

3-
if test -z "${DIR}"; then
3+
SUDO=""
4+
if [[ $EUID -ne 0 ]]; then
5+
SUDO="sudo -E"
6+
fi
7+
8+
if test -z "${DIR}"; then
49
echo "This script should not be called directly."
510
exit -1
6-
fi
11+
fi
712

813
USER="docker"
914
GROUP="docker"
@@ -15,9 +20,9 @@ for dep in '.8.*' '.7.*' '.6.*' '.5.*' '.4.*' '.3.*' '.2.*' '.1.*' ''; do
1520
if test -z "$image"; then image="$IMAGE"; fi
1621

1722
if grep -q 'AS build' "$dockerfile"; then
18-
sudo docker build --network=host --file="$dockerfile" --target build -t "$image:build" "$DIR" $(env | grep -E '_(proxy|REPO|VER)=' | sed 's/^/--build-arg /') --build-arg USER=${USER} --build-arg GROUP=${GROUP} --build-arg UID=$(id -u) --build-arg GID=$(id -g)
23+
${SUDO} docker build --network=host --file="$dockerfile" --target build -t "$image:build" "$DIR" $(env | grep -E '_(proxy|REPO|VER)=' | sed 's/^/--build-arg /') --build-arg USER=${USER} --build-arg GROUP=${GROUP} --build-arg UID=$(id -u) --build-arg GID=$(id -g)
1924
fi
2025

21-
sudo docker build --network=host --file="$dockerfile" -t "$image:latest" "$DIR" $(env | grep -E '_(proxy|REPO|VER)=' | sed 's/^/--build-arg /') --build-arg USER=${USER} --build-arg GROUP=${GROUP} --build-arg UID=$(id -u) --build-arg GID=$(id -g)
26+
${SUDO} docker build --network=host --file="$dockerfile" -t "$image:latest" "$DIR" $(env | grep -E '_(proxy|REPO|VER)=' | sed 's/^/--build-arg /') --build-arg USER=${USER} --build-arg GROUP=${GROUP} --build-arg UID=$(id -u) --build-arg GID=$(id -g)
2227
done
2328
done

0 commit comments

Comments
 (0)