diff --git a/LDP/lampadas/conf/install.sh b/LDP/lampadas/conf/install.sh index cd41dd41..f3dfb839 100755 --- a/LDP/lampadas/conf/install.sh +++ b/LDP/lampadas/conf/install.sh @@ -3,17 +3,23 @@ # Installs the configuration file # -confprefix=/etc +confprefix=/etc/lampadas +INSTALLDIR="install -d" INSTALLCONF="install -p -m 644 --backup=simple" +$INSTALLDIR $confprefix + +# Ask user before overwriting their configuration files. +# newconf=N +doinstall=N if [ -f $confprefix/lampadas.conf ]; then - echo "Installation will overwrite your configuration file," + echo "Installation will overwrite your lampadas.conf configuration file," echo "but it will make a backup in lampadas.conf~." echo "" - echo "Do you want to install a new configuration file? (y/n):" + echo "Do you want to install a new lampadas.conf configuration file? (y/n):" read newconf @@ -30,11 +36,47 @@ fi if [ "$doinstall" = "Y" ]; then $INSTALLCONF lampadas.conf $confprefix/lampadas.conf - echo "The configuration file was installed." + echo "The configuration file lampadas.conf was installed." if [ "$newconf" = "Y" ]; then - echo "The backup file is /etc/lampadas.conf~." + echo "The backup file is lampadas.conf~." fi else - echo "The configuration file was not installed." + echo "The configuration file lampadas.conf was not installed." +fi + +# Ask user before overwriting their configuration files. +# +newconf=N +doinstall=N + +if [ -f $confprefix/tidyrc ]; then + echo "Installation will overwrite your Lampadas tidyrc configuration file," + echo "but it will make a backup in tidyrc~." + echo "" + echo "NOTE: this does not overwrite your regular /etc/tidyrc file." + echo "" + echo "Do you want to install a new tidyrc configuration file? (y/n):" + + read newconf + + if [ "$newconf" = "y" ]; then + newconf=Y + fi + + if [ "$newconf" = "Y" ]; then + doinstall=Y + fi +else + doinstall=Y +fi + +if [ "$doinstall" = "Y" ]; then + $INSTALLCONF tidyrc $confprefix/tidyrc + echo "The configuration file tidyrc was installed." + if [ "$newconf" = "Y" ]; then + echo "The backup file is tidyrc~." + fi +else + echo "The configuration file tidyrc was not installed." fi diff --git a/LDP/lampadas/conf/tidyrc b/LDP/lampadas/conf/tidyrc new file mode 100644 index 00000000..2269b0c1 --- /dev/null +++ b/LDP/lampadas/conf/tidyrc @@ -0,0 +1,26 @@ +# This file sets proper configuration of tidy for document +# processing in Lampadas. +# +tidy-mark: no +markup: yes +wrap: 80 +wrap-attributes: no +wrap-script-literals: no +wrap-sections: no +literal-attributes: no +tab-size: 4 +indent: auto +indent-spaces: 2 +indent-attributes: no +hide-endtags: no +input-xml: yes +output-xml: yes +doctype: omit +break-before-br: yes +enclose-text: yes + +new-empty-tags: +new-inline-tags: emphasis +new-blocklevel-tags: article articleinfo author para +new-pre-tags: screen literallayout programlisting +