Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/readme file naming #90

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix/readme file naming #90

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5865ffc
Fixed grep for evaluating version of current xrdp git repository
Nov 21, 2017
9ebfe67
Fixed naming of readme.txt to README.md
Nov 21, 2017
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
8 changes: 4 additions & 4 deletions X11rdp-o-matic.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ compile_xrdp_interactive()
rm README.Debian
rm README.source
cp ../COPYING copyright # use the xrdp copyright file
cp ../readme.txt README # use the xrdp readme.txt as the README file
cp ../README.md README # use the xrdp readme.txt as the README file
cp "$BASEDIR/debian/postinst" postinst # postinst to create xrdp init.d defaults
cp "$BASEDIR/debian/control" control # use a generic control file
cp "$BASEDIR/debian/prerm" prerm # pre-removal script
Expand Down Expand Up @@ -531,7 +531,7 @@ compile_xrdp_noninteractive()
rm README.Debian
rm README.source
cp ../COPYING copyright # use the xrdp copyright file
cp ../readme.txt README # use the xrdp readme.txt as the README file
cp ../README.md README # use the xrdp readme.txt as the README file
cp "$BASEDIR/debian/postinst" postinst # postinst to create xrdp init.d defaults
cp "$BASEDIR/debian/control" control # use a generic control file
cp "$BASEDIR/debian/prerm" prerm # pre-removal script
Expand Down Expand Up @@ -676,9 +676,9 @@ welcome_message()
# Worked out from the chosen branch.
calculate_version_num()
{
README="https://raw.github.com/neutrinolabs/xrdp/$XRDPBRANCH/readme.txt"
README="https://raw.github.com/neutrinolabs/xrdp/$XRDPBRANCH/README.md"
wget --no-check-certificate -O "$TMPFILE" "$README" >& /dev/null
VERSION=$(grep xrdp "$TMPFILE" | head -1 | cut -d " " -f2)
VERSION=$(grep -i version "$TMPFILE" | head -1 | cut -d " " -f3)
rm -f "$TMPFILE"
if [ "${XRDPBRANCH#v}" = "$XRDPBRANCH" ]
then
Expand Down