Add $ sign before bash commands

diff --git a/parts/Instalation.tex b/parts/Instalation.tex
index dace3500e048c30ce1ce695c6c76b21690f48e31..b4f03b418f71fbd81e6651948828cd9929782820 100644 (file)
--- a/parts/Instalation.tex
+++ b/parts/Instalation.tex
@@ -56,32 +56,32 @@ These differences make it possible to have several different versions installed
     \item  Run the following commands (this takes awhile):
 
         \begin{lstlisting}[language=bash]
     \item  Run the following commands (this takes awhile):
 
         \begin{lstlisting}[language=bash]

-cd /<build_path>/           # this is where you need the 2.5GB of disk space
-git clone --depth 1 "git://git.cinelerra-gg.org/goodguy/cinelerra.git" cinelerra5 
-cd cinelerra5/cinelerra-5.1 # toplevel directory
+$ cd /<build_path>/           # this is where you need the 2.5GB of disk space
+$ git clone --depth 1 "git://git.cinelerra-gg.org/goodguy/cinelerra.git" cinelerra5 
+$ cd cinelerra5/cinelerra-5.1 # toplevel directory

         \end{lstlisting}
 
         NOTE: if your system has never had Cinelerra-GG Infinity installed, you will have to make sure you have all of the compilers and libraries necessary.  
         So on the very first build you should run:
 
         \begin{lstlisting}[language=bash]
         \end{lstlisting}
 
         NOTE: if your system has never had Cinelerra-GG Infinity installed, you will have to make sure you have all of the compilers and libraries necessary.  
         So on the very first build you should run:
 
         \begin{lstlisting}[language=bash]

-./blds/bld_prepare.sh <os> # where <os> represents the Operating System of centos, fedora, suse, leap, ubuntu, debian.
-./autogen.sh
-./configure --prefix=/usr  # optional parameters can be added here
-make 2>&1 | tee log        # make and log the build
+$ ./blds/bld_prepare.sh <os> # where <os> represents the Operating System of centos, fedora, suse, leap, ubuntu, debian.
+$ ./autogen.sh
+$ ./configure --prefix=/usr  # optional parameters can be added here
+$ make 2>&1 | tee log        # make and log the build

         \end{lstlisting}
     \item  Check for obvious build errors:
         \begin{lstlisting}[language=bash]
         \end{lstlisting}
     \item  Check for obvious build errors:
         \begin{lstlisting}[language=bash]

-grep "\*\*\*.*error" -ai log
+$ grep "\*\*\*.*error" -ai log

         \end{lstlisting}
         If this reports errors and you need assistance or you think improvements can be made to the build s,
         email the log which is listed below to \url{cin@lists.cinelerra-gg.org:}
         \begin{lstlisting}[language=bash]
         \end{lstlisting}
         If this reports errors and you need assistance or you think improvements can be made to the build s,
         email the log which is listed below to \url{cin@lists.cinelerra-gg.org:}
         \begin{lstlisting}[language=bash]

-/<build_path>/cinelerra5/cinelerra-5.1/log
+$ /<build_path>/cinelerra5/cinelerra-5.1/log

         \end{lstlisting}
     \item  If there are no build errors, finally just run:
         \begin{lstlisting}[language=bash]
         \end{lstlisting}
     \item  If there are no build errors, finally just run:
         \begin{lstlisting}[language=bash]

-    make install
+   $  make install

         \end{lstlisting}
     \item  If it all worked, you are all setup. Just click on the cinelerra desktop icon.
 \end{enumerate}
         \end{lstlisting}
     \item  If it all worked, you are all setup. Just click on the cinelerra desktop icon.
 \end{enumerate}


@@ -93,9 +93,9 @@ grep "\*\*\*.*error" -ai log
     \item  The "\texttt{git}" step has to download many files (approx 100\,MB) so allow time.
     \item  Run the following commands (this takes awhile):
         \begin{lstlisting}[language=bash]
     \item  The "\texttt{git}" step has to download many files (approx 100\,MB) so allow time.
     \item  Run the following commands (this takes awhile):
         \begin{lstlisting}[language=bash]

-cd /<build_path>/           # this is where you need the 2.5GB of disk space
-git clone --depth 1 "git://git.cinelerra-gg.org/goodguy/cinelerra.git" cinelerra5 
-cd cinelerra5/cinelerra-5.1 # toplevel directory
+$ cd /<build_path>/           # this is where you need the 2.5GB of disk space
+$ git clone --depth 1 "git://git.cinelerra-gg.org/goodguy/cinelerra.git" cinelerra5 
+$ cd cinelerra5/cinelerra-5.1 # toplevel directory

         \end{lstlisting}
 \end{enumerate}
 
         \end{lstlisting}
 \end{enumerate}
 


@@ -103,22 +103,22 @@ NOTE: if your system has never had Cinelerra-GG Infinity installed, you will hav
 the compilers and libraries necessary are installed. So on the very first build you should run as \textbf{root}:
 
 \begin{lstlisting}[language=bash]
 the compilers and libraries necessary are installed. So on the very first build you should run as \textbf{root}:
 
 \begin{lstlisting}[language=bash]

-./blds/bld_prepare.sh <os>     # where <os> represents the Operating System of centos, fedora, suse, leap, ubuntu, debian.
-./autogen.sh
-./configure --with-single-user # the “with-single-user” parameter makes it so
-make 2>&1 | tee log            # make and log build (check for errors before proceeding)
-make install
+$ ./blds/bld_prepare.sh <os>     # where <os> represents the Operating System of centos, fedora, suse, leap, ubuntu, debian.
+$ ./autogen.sh
+$ ./configure --with-single-user # the “with-single-user” parameter makes it so
+$ make 2>&1 | tee log            # make and log build (check for errors before proceeding)
+$ make install

 \end{lstlisting}
 
 Then just start the application by keying in: ./cin in the bin subdirectory OR add a desktop icon by
 using the appropriate directory to copy the files to, run as \textbf{root}, and edit to correct the directory path.
 
 \begin{lstlisting}[language=bash]
 \end{lstlisting}
 
 Then just start the application by keying in: ./cin in the bin subdirectory OR add a desktop icon by
 using the appropriate directory to copy the files to, run as \textbf{root}, and edit to correct the directory path.
 
 \begin{lstlisting}[language=bash]

-cd /cinelerra_directory_path
-cp -a image/cin.{svg,xpm} /usr/share/pixmaps/.
-cp -a image/cin.desktop /usr/share/applications/cin.desktop
-change the “Exec=cin” line to be “Exec=<your_directory_path>/bin/cin”
+$ cd /cinelerra_directory_path
+$ cp -a image/cin.{svg,xpm} /usr/share/pixmaps/.
+$ cp -a image/cin.desktop /usr/share/applications/cin.desktop

 \end{lstlisting}
 \end{lstlisting}

+Change the “Exec=cin” line to be “Exec=<your\_directory\_path>/bin/cin”

 
 The preceding directions for doing a single-user build has been meticulously followed to build and run
 on a newly installed ubuntu 15 system WITHOUT BEING ROOT except for the \texttt{bld\_prepare.sh} and creating the desktop icon.
 
 The preceding directions for doing a single-user build has been meticulously followed to build and run
 on a newly installed ubuntu 15 system WITHOUT BEING ROOT except for the \texttt{bld\_prepare.sh} and creating the desktop icon.


@@ -131,12 +131,12 @@ These procedures and the Cinelerra-GG Infinity software have all been run as “
 To see the full list of features use:   
 
 \begin{lstlisting}[language=bash]
 To see the full list of features use:   
 
 \begin{lstlisting}[language=bash]

-./configure –help
+$ ./configure –help

 \end{lstlisting}
 The default build is a system build which uses:    
 
 \begin{lstlisting}[language=bash]
 \end{lstlisting}
 The default build is a system build which uses:    
 
 \begin{lstlisting}[language=bash]

-./configure –without-single-user
+$ ./configure –without-single-user

 \end{lstlisting}
 
 In the single-user build, the target directory is always “cin”.  
 \end{lstlisting}
 
 In the single-user build, the target directory is always “cin”.  


@@ -145,24 +145,24 @@ However, you can rename files after the install is complete.
 
 f your distro/operating system has issues with the default install to \texttt{/usr/local}, you might have to change the location to /usr for a system build.  Then you will have to use:
 \begin{lstlisting}[language=bash]
 
 f your distro/operating system has issues with the default install to \texttt{/usr/local}, you might have to change the location to /usr for a system build.  Then you will have to use:
 \begin{lstlisting}[language=bash]

-./configure --prefix=/usr
+$ ./configure --prefix=/usr

 \end{lstlisting}
 
 If you wish to change the default directory for a system build you will have to add the destination directory path on the “\texttt{make install}” line.  For example:
 \begin{lstlisting}[language=bash]
 \end{lstlisting}
 
 If you wish to change the default directory for a system build you will have to add the destination directory path on the “\texttt{make install}” line.  For example:
 \begin{lstlisting}[language=bash]

-make install DESTDIR=<your selected target directory path>
+$ make install DESTDIR=<your selected target directory path>

 \end{lstlisting}
 
 The application name can be set during installation, but defaults to cin so that the GG/Infinity build can coexist with other Cinelerra builds if necessary.  To override the default cin name, use:   
 \begin{lstlisting}[language=bash]
 \end{lstlisting}
 
 The application name can be set during installation, but defaults to cin so that the GG/Infinity build can coexist with other Cinelerra builds if necessary.  To override the default cin name, use:   
 \begin{lstlisting}[language=bash]

-./configure --with-exec-name=cinelerra
+$ ./configure --with-exec-name=cinelerra

 \end{lstlisting}
 
 The home configuration directory can also be set, but defaults to \texttt{\$\$HOME/.bcast5}.  
 For example:
 
 \begin{lstlisting}[language=bash]
 \end{lstlisting}
 
 The home configuration directory can also be set, but defaults to \texttt{\$\$HOME/.bcast5}.  
 For example:
 
 \begin{lstlisting}[language=bash]

-./configure –with-config-dir=/myusername/.bcast5
+$ ./configure –with-config-dir=/myusername/.bcast5

 \end{lstlisting}
 
 NOTE:  when you specify parameters to the configure program, it will create a make file as a consequence.  
 \end{lstlisting}
 
 NOTE:  when you specify parameters to the configure program, it will create a make file as a consequence.  


@@ -173,7 +173,7 @@ It may be necessary on some distros which have missing or incomplete up-to-date
 To do so, use:
 
 \begin{lstlisting}[language=bash]
 To do so, use:
 
 \begin{lstlisting}[language=bash]

-./configure --prefix=/usr --without-ladspa-build
+$ ./configure --prefix=/usr --without-ladspa-build

 \end{lstlisting}
 
 Note that the with-ladspa-dir is the ladspa search path, and exists even if the ladspa build is not selected.  This gives you the ability to specify an alternate ladspa system path by utilizing the \texttt{LADSPA\_PATH} environment variable (that is, the default ladspa build is deselected).
 \end{lstlisting}
 
 Note that the with-ladspa-dir is the ladspa search path, and exists even if the ladspa build is not selected.  This gives you the ability to specify an alternate ladspa system path by utilizing the \texttt{LADSPA\_PATH} environment variable (that is, the default ladspa build is deselected).


@@ -181,8 +181,8 @@ Note that the with-ladspa-dir is the ladspa search path, and exists even if the
 Note for 32-bit 14.2 Slackware, Debian, Gentoo, Arch, FreeBSD, before running the configure, you will need to set up the following:
 
 \begin{lstlisting}[language=bash]
 Note for 32-bit 14.2 Slackware, Debian, Gentoo, Arch, FreeBSD, before running the configure, you will need to set up the following:
 
 \begin{lstlisting}[language=bash]

-export ac_cv_header_xmmintrin_h=no
-export FFMPEG_EXTRA_CFG=" --disable-vdpau"
+$ export ac_cv_header_xmmintrin_h=no
+$ export FFMPEG_EXTRA_CFG=" --disable-vdpau"

 \end{lstlisting}
 
 \subsection{Notes about Building from Git in your Customized Environment}%
 \end{lstlisting}
 
 \subsection{Notes about Building from Git in your Customized Environment}%


@@ -238,7 +238,7 @@ There may be several libraries which need special treatment.
 An example of a problem you might encounter with your customized installation is with “\texttt{a52dec}” which has probes \texttt{(CHECK\_LIB/CHECK\_HEADER)} in \texttt{configure.ac}, but \texttt{djbfft} does not.  
 In this case, \texttt{djbfft} is only built because \texttt{a52dec} is built, so if your system has \texttt{a52dec}, set \texttt{a52dec} to auto and see if that problem is solved by retrying the build with:  
 \begin{lstlisting}[language=bash]
 An example of a problem you might encounter with your customized installation is with “\texttt{a52dec}” which has probes \texttt{(CHECK\_LIB/CHECK\_HEADER)} in \texttt{configure.ac}, but \texttt{djbfft} does not.  
 In this case, \texttt{djbfft} is only built because \texttt{a52dec} is built, so if your system has \texttt{a52dec}, set \texttt{a52dec} to auto and see if that problem is solved by retrying the build with:  
 \begin{lstlisting}[language=bash]

-./confgure --with-single-user –enable-a52dec=auto .
+$ ./confgure --with-single-user –enable-a52dec=auto .

 \end{lstlisting}
 
 With persistence, you can get results, but it may take several tries to stabilize the build.  
 \end{lstlisting}
 
 With persistence, you can get results, but it may take several tries to stabilize the build.  


@@ -248,11 +248,11 @@ If you need help, email the "\texttt{log}" and "\texttt{config.log}", which is u
 If you have already installed the \texttt{libfdk\_aac} development package on your computer because you prefer this version over the default aac, you will have to do the following to get this alternative operational.
 
 \begin{lstlisting}[language=bash]
 If you have already installed the \texttt{libfdk\_aac} development package on your computer because you prefer this version over the default aac, you will have to do the following to get this alternative operational.
 
 \begin{lstlisting}[language=bash]

-export FFMPEG_EXTRA_CFG=" --enable-libfdk-aac --enable-nonfree"
-export EXTRA_LIBS=" -lfdk-aac"
-for f in `grep -lw aac cinelerra-5.1/ffmpeg/audio/*`; do
-  sed -e 's/\<aac\>/libfdk_aac/' -i $f
-done
+$ export FFMPEG_EXTRA_CFG=" --enable-libfdk-aac --enable-nonfree"
+$ export EXTRA_LIBS=" -lfdk-aac"
+$ for f in `grep -lw aac cinelerra-5.1/ffmpeg/audio/*`; do
+$   sed -e 's/\<aac\>/libfdk_aac/' -i $f
+$ done

 \end{lstlisting}
 
 \subsection{Cloning the Repository for Faster Updates}%
 \end{lstlisting}
 
 \subsection{Cloning the Repository for Faster Updates}%


@@ -270,8 +270,9 @@ The repo path is always a perfect clone of the main repo.
 add “- - depth 1” before cin5 which is faster/smaller, but has no history.
 
 \begin{lstlisting}
 add “- - depth 1” before cin5 which is faster/smaller, but has no history.
 
 \begin{lstlisting}

-# cd /<repo\_path>/
-# git clone "git://git.cinelerra-gg.org/goodguy/cinelerra" cin5
+$ cd /<repo\_path>/
+$ git clone "git://git.cinelerra-gg.org/goodguy/cinelerra" cin5
+

 Cloning into "cin5"...
 remote: Counting objects: 20032, done.
 remote: Compressing objects: 100% (11647/11647), done.
 Cloning into "cin5"...
 remote: Counting objects: 20032, done.
 remote: Compressing objects: 100% (11647/11647), done.


@@ -281,6 +282,18 @@ Resolving deltas: 100% (11333/11333), done.
 Checking connectivity... done.
 \end{lstlisting}
 
 Checking connectivity... done.
 \end{lstlisting}
 

+\paragraph{Update an existing repo}%
+\label{par:update_an_existing_repo}
+~
+
+\begin{lstlisting}
+    $ cd /<repo home>/cin5
+    $ git pull
+\end{lstlisting}
+
+
+
+