paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 01:39:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Do not use scripts, but let fpcmkcfg create eventual parent directories

Browse Source 
git-svn-id: trunk@17185 -
This commit is contained in:
joost 2011-03-26 20:48:31 +00:00
parent baf0ed35f3
commit dc5f4b038d
1 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
compiler/utils/samplecfg
View File

@ -44,32 +44,15 @@ if [ -f "$FPBIN" ] ; then
fpinifile="$HOME"/.fp/fp.ini fpinifile="$HOME"/.fp/fp.ini
fpcfgfile="$HOME"/.fp/fp.cfg fpcfgfile="$HOME"/.fp/fp.cfg
# Detect if we have write permission in sysfpdirbase. # Detect if we have write permission in sysfpdir, or that the directory can be made
if [ -w "$sysfpdirbase" ] ; then if ( [ -d "$sysfpdirbase" ] && [ -w "$sysfpdirbase" ] && ! [ -d "$sysfpdirbase2" ] ) ||
echo Write permission in $sysfpdirbase. ( [ -d "$sysfpdirbase2" ] && [ -w "$sysfpdirbase2" ] && ! [ -d "$sysfpdir" ] ) ||
if ! [ -d "$sysfpdirbase2" ] ; then ( [ -d "$sysfpdir" ] && [ -w "$sysfpdir" ] ) ; then
echo Directory $sysfpdirbase2 did not exist, attempting to create it now fpinifile="$sysfpdir"/fp.ini
mkdir $sysfpdirbase2 >/dev/null 2>&1 fpcfgfile="$sysfpdir"/fp.cfg
echo Attempting to create directory $sysfpdir
mkdir $sysfpdir >/dev/null 2>&1
elif ! [ -d "$sysfpdir" ] ; then
echo Directory $sysfpdir did not exist, attempting to create it now
mkdir $sysfpdir >/dev/null 2>&1
fi
if [ -w "$sysfpdir" ] ; then
fpinifile="$sysfpdir"/fp.ini
fpcfgfile="$sysfpdir"/fp.cfg
fi
fi fi
# #
# When the local FP IDE configuration is used, check if the directory exists
if [ $fpcfgfile = "$HOME"/.fp/fp.cfg -a ! -d "$HOME"/.fp ] ; then
echo Directory $HOME/.fp did not exist, attempting to create it now
mkdir "$HOME"/.fp >/dev/null 2>&1
fi
fi fi
#
# set right path to FPC with $fpcversion # set right path to FPC with $fpcversion
FPCPATH=`dirname "$1"`/\$fpcversion FPCPATH=`dirname "$1"`/\$fpcversion
@ -84,8 +67,8 @@ fi
# Write fp.cfg # Write fp.cfg
echo Writing sample configuration file to $fpcfgfile echo Writing sample configuration file to $fpcfgfile
fpcmkcfg -1 -d "basepath=$FPCPATH" -o $fpcfgfile fpcmkcfg -p -1 -d "basepath=$FPCPATH" -o $fpcfgfile
# Write fp.ini # Write fp.ini
echo Writing sample configuration file to $fpinifile echo Writing sample configuration file to $fpinifile
fpcmkcfg -2 -o $fpinifile fpcmkcfg -p -2 -o $fpinifile