Skip to content
This repository was archived by the owner on Jan 29, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arch/install-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions arch/makepkg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -17,22 +17,22 @@ 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
)
###############################################################################
# XORGXRDP
# 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
)
###############################################################################
Expand Down
2 changes: 1 addition & 1 deletion ubuntu/16.04/config-user.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ubuntu/16.04/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -121,7 +121,7 @@ if [ ! -d $XORGXRDP_PATH ]; then
fi

# Configure XORGXRDP
cd $XORGXRDP_PATH
cd $XORGXRDP_PATH || exit
./bootstrap
./configure

Expand Down
2 changes: 1 addition & 1 deletion ubuntu/18.04/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down