1
0
forked from mir/linux-vm-tools

Merge pull request #64 from samueloph/samueloph_shellcheck

fix shellcheck reported problems
This commit is contained in:
Justin 2018-10-22 10:04:18 -07:00 committed by GitHub
commit d30ea7e6e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 10 deletions

View File

@ -6,7 +6,7 @@
# The configuration is adapted from the Ubuntu 16.04 script.
#
if [ $(id -u) -ne 0 ]; then
if [ "$(id -u)" -ne 0 ]; then
echo 'This script must be run with root privileges' >&2
exit 1
fi

View File

@ -4,7 +4,7 @@
# This script is for Arch Linux to download and install XRDP+XORGXRDP
#
if [ $(id -u) -eq 0 ]; then
if [ "$(id -u)" -eq 0 ]; then
echo 'This script must be run as a non-root user, as building packages as root is unsupported.' >&2
exit 1
fi
@ -17,14 +17,14 @@ sudo pacman -Syu --needed --noconfirm base base-devel git
# Create a build directory in tmpfs
TMPDIR=$(mktemp -d)
pushd $TMPDIR
pushd "$TMPDIR" || exit
###############################################################################
# XRDP
#
(
git clone https://aur.archlinux.org/xrdp.git
cd xrdp
cd xrdp || exit
makepkg -sri --noconfirm
)
###############################################################################
@ -32,7 +32,7 @@ pushd $TMPDIR
# Devel version, because release version includes a bug crashing gnome-settings-daemon
(
git clone https://aur.archlinux.org/xorgxrdp-devel-git.git
cd xorgxrdp-devel-git
cd xorgxrdp-devel-git || exit
makepkg -sri --noconfirm
)
###############################################################################

View File

@ -7,7 +7,7 @@
# Major thanks to: http://c-nergy.be/blog/?p=10752 for the tips.
#
if [ ! $(id -u) ]; then
if [ ! "$(id -u)" ]; then
echo 'This script must be run with root privileges' >&2
exit 1
fi

View File

@ -11,7 +11,7 @@
# Update our machine to the latest code if we need to.
#
if [ $(id -u) -ne 0 ]; then
if [ "$(id -u)" -ne 0 ]; then
echo 'This script must be run with root privileges' >&2
exit 1
fi
@ -48,7 +48,7 @@ if [ ! -d $XRDP_PATH ]; then
fi
# Configure XRDP
cd $XRDP_PATH
cd $XRDP_PATH || exit
./bootstrap
./configure --enable-ipv6 --enable-jpeg --enable-fuse --enable-rfxcodec --enable-opus --enable-painter --enable-vsock
@ -121,7 +121,7 @@ if [ ! -d $XORGXRDP_PATH ]; then
fi
# Configure XORGXRDP
cd $XORGXRDP_PATH
cd $XORGXRDP_PATH || exit
./bootstrap
./configure

View File

@ -11,7 +11,7 @@
# Update our machine to the latest code if we need to.
#
if [ $(id -u) -ne 0 ]; then
if [ "$(id -u)" -ne 0 ]; then
echo 'This script must be run with root privileges' >&2
exit 1
fi