diff --git a/srcpkgs/texlive-bin/INSTALL b/srcpkgs/texlive-bin/INSTALL index 48b10d8a46..f3013a2701 100644 --- a/srcpkgs/texlive-bin/INSTALL +++ b/srcpkgs/texlive-bin/INSTALL @@ -1,14 +1,11 @@ # -# This script will advise the user of the needed -# steps to install and configure TeXLive -# and to re-login or source to have TeXLive included in PATH +# This script will advise the user of the needed steps to +# configure TeXLive and to have TeXLive included in PATH # case "${ACTION}" in -pre) - ;; post) - #cd /opt/texlive-installer - #./install-tl -profile void.profile + cd /opt/texlive-installer + ./install-tl -profile void.profile cat << _EOF @@ -16,27 +13,45 @@ post) - TeXLive is free software see the files: - in /opt/texlive-installer/LICENSE.TL - in /opt/texlive-installer/LICENSE.CTAN + /usr/share/licenses/texlive-bin/LICENSE.TL + /usr/share/licenses/texlive-bin/LICENSE.CTAN - install-tl is smart enough to guess your architecture during the - installation. - - The template take care of adding the installation PATH of texlive - in /etc/profile.d/texlive.sh. +===================================================================== - Setting it /opt/texlive/????/bin/ where ???? is the year of - the TeXLive version and arch is: - - X86_64-linux ==> voidlinux X86_64 architecture - - i386-linux ==> voidlinux i386 architecture - - At the next reboot the PATH is correct, if you want you can type + This package sets the location of TeXLive binary using the file: + /etc/profile.d/texlive.sh. + + see http://www.tug.org/texlive/quickinstall.html for details + + Check if your PATH is update correctly with: + + $ printenv + + You may need to reboot to ensure that PATH is update correctly, + for the impatients, if you want you can type $ sudo source /etc/profile - check if it is ok with: + and check the PATH. - $ printenv +===================================================================== + + To update you TeXLive installation use only the program + + /opt/texlive/????//tlmgr. + + where the ???? is the TeXLive version and is: + - X86_64-linux ==> voidlinux X86_64 architecture + - i386-linux ==> voidlinux i386 architecture + + see: + + http://www.tug.org/texlive/doc/tlmgr.html#EXAMPLES + + for the details and the documentation in + + WARNING: To avoid messing up your TeXLive installation, DON'T use + the installation scripts in /opt/texlive-installer. ===================================================================== _EOF diff --git a/srcpkgs/texlive-bin/REMOVE b/srcpkgs/texlive-bin/REMOVE index 37f0e1c9dd..d4b5cd1845 100644 --- a/srcpkgs/texlive-bin/REMOVE +++ b/srcpkgs/texlive-bin/REMOVE @@ -1,10 +1,7 @@ # This script will clear the TeXLive directory -# and the /etc/profile.d/texlive.sh # case "${ACTION}" in -pre) +post) rm -rf /opt/texlive/2013 ;; -post) - ;; esac \ No newline at end of file diff --git a/srcpkgs/texlive-bin/files/texlive.sh b/srcpkgs/texlive-bin/files/texlive.sh new file mode 100644 index 0000000000..99d52f4f6b --- /dev/null +++ b/srcpkgs/texlive-bin/files/texlive.sh @@ -0,0 +1,2 @@ +#location of the TeXLive binaries +export PATH=$PATH:/opt/texlive/2013/bin/@@ARCH@@ diff --git a/srcpkgs/texlive-bin/files/texlive.sh.i686 b/srcpkgs/texlive-bin/files/texlive.sh.i686 deleted file mode 100644 index aba00d021b..0000000000 --- a/srcpkgs/texlive-bin/files/texlive.sh.i686 +++ /dev/null @@ -1,3 +0,0 @@ -#location of the TeXLive binaries -export PATH=$PATH:/opt/texlive/2013/bin/i386-linux - diff --git a/srcpkgs/texlive-bin/files/texlive.sh.x86_64 b/srcpkgs/texlive-bin/files/texlive.sh.x86_64 deleted file mode 100644 index 19652d9943..0000000000 --- a/srcpkgs/texlive-bin/files/texlive.sh.x86_64 +++ /dev/null @@ -1,2 +0,0 @@ -#location of the TeXLive binaries -export PATH=$PATH:/opt/texlive/2013/bin/x86_64-linux diff --git a/srcpkgs/texlive-bin/template b/srcpkgs/texlive-bin/template index eea86e7f28..1c18fbd48d 100644 --- a/srcpkgs/texlive-bin/template +++ b/srcpkgs/texlive-bin/template @@ -48,10 +48,12 @@ do_install(){ fi vinstall ${DESTDIR}/opt/texlive-installer/LICENSE.CTAN 644 usr/share/licenses/texlive vinstall ${DESTDIR}/opt/texlive-installer/LICENSE.TL 644 usr/share/licenses/texlive + vmkdir etc/profile.d # For system environment vars and desktop extra shortcut case "$XBPS_TARGET_MACHINE" in - i686) vinstall ${FILESDIR}/texlive.sh.i686 644 etc/profile.d texlive.sh ;; - x86_64) vinstall ${FILESDIR}/texlive.sh.x86_64 644 etc/profile.d texlive.sh ;; + i686) sed -e 's/@@ARCH@@/i386/' ${FILESDIR}/texlive.sh > ${DESTDIR}/etc/profile.d/texlive.sh ;; + x86_64) sed -e 's/@@ARCH@@/x86_64/' ${FILESDIR}/texlive.sh > ${DESTDIR}/etc/profile.d/texlive.sh ;; esac + }