vim/linux-vm-tools
1
0
Fork 0
forked from mir/linux-vm-tools
Code Pull Requests Activity

Merge pull request #64 from samueloph/samueloph_shellcheck

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/install-config.sh
View File

@ -6,7 +6,7 @@
# The configuration is adapted from the Ubuntu 16.04 script. # 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 echo 'This script must be run with root privileges' >&2
exit 1 exit 1
fi fi

8
arch/makepkg.sh
View File

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

2
ubuntu/16.04/config-user.sh
View File

@ -7,7 +7,7 @@
# Major thanks to: http://c-nergy.be/blog/?p=10752 for the tips. # 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 echo 'This script must be run with root privileges' >&2
exit 1 exit 1
fi fi

6
ubuntu/16.04/install.sh
View File

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

2
ubuntu/18.04/install.sh
View File

@ -11,7 +11,7 @@
# Update our machine to the latest code if we need to. # 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 echo 'This script must be run with root privileges' >&2
exit 1 exit 1
fi fi