JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup winsup/doc/etc.{postinstall,preremove}.cygwin-doc.sh quote test variables, correct utility paths, define site in preremove

Browse Source
This commit is contained in:
Brian Inglis 2017-12-22 11:35:56 -07:00 committed by Corinna Vinschen
parent ae3bd4f49e
commit 3cc77b4f29
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
winsup/doc/etc.postinstall.cygwin-doc.sh
View File

@ -10,9 +10,9 @@
doc=/usr/share/doc/cygwin-doc doc=/usr/share/doc/cygwin-doc
site=https://cygwin.com site=https://cygwin.com
cygp=/bin/cygpath cygp=/usr/bin/cygpath
mks=/bin/mkshortcut mks=/usr/bin/mkshortcut
launch=/bin/cygstart launch=/usr/bin/cygstart
html=$doc/html html=$doc/html
@ -29,7 +29,7 @@ done
# check for programs # check for programs
for p in $cygp $mks $launch for p in $cygp $mks $launch
do do
if [ ! -x $p ] if [ ! -x "$p" ]
then then
echo "Can't find program '$p'" echo "Can't find program '$p'"
exit 2 exit 2
@ -52,7 +52,7 @@ fi
# create User Guide and API PDF and HTML shortcuts # create User Guide and API PDF and HTML shortcuts
while read target name desc while read target name desc
do do
[ -r $target ] && $mks $CYGWINFORALL -P -n "Cygwin/$name" -d "$desc" -- $target [ -r "$target" ] && $mks $CYGWINFORALL -P -n "Cygwin/$name" -d "$desc" -- $target
done <<EOF done <<EOF
$doc/cygwin-ug-net.pdf User\ Guide\ \(PDF\) Cygwin\ User\ Guide\ PDF $doc/cygwin-ug-net.pdf User\ Guide\ \(PDF\) Cygwin\ User\ Guide\ PDF
$html/cygwin-ug-net/index.html User\ Guide\ \(HTML\) Cygwin\ User\ Guide\ HTML $html/cygwin-ug-net/index.html User\ Guide\ \(HTML\) Cygwin\ User\ Guide\ HTML

5
winsup/doc/etc.preremove.cygwin-doc.sh
View File

@ -9,7 +9,8 @@
# exits quietly if directory does not exist as presumably no shortcuts desired # exits quietly if directory does not exist as presumably no shortcuts desired
doc=/usr/share/doc/cygwin-doc doc=/usr/share/doc/cygwin-doc
cygp=/bin/cygpath site=https://cygwin.com
cygp=/usr/bin/cygpath
rm=/bin/rm rm=/bin/rm
html=$doc/html html=$doc/html
@ -17,7 +18,7 @@ html=$doc/html
# check for programs # check for programs
for p in $cygp $rm for p in $cygp $rm
do do
if [ ! -x $p ] if [ ! -x "$p" ]
then then
echo "Can't find program '$p'" echo "Can't find program '$p'"
exit 2 exit 2