From: fsLeg <fsleg@t-rg.ws>
Date: Sat, 22 Nov 2014 14:41:59 +0000 (+0300)
Subject: Opera: fixed a small typo, cleaned LD_LIBRARY_PATH variable a bit when package is... 
X-Git-Url: https://git.t-rg.ws/?a=commitdiff_plain;h=4ce3075ca8806fb2443c1544313d69f53fb6fd41;p=slackbuilds.git

Opera: fixed a small typo, cleaned LD_LIBRARY_PATH variable a bit when package is built without FFmpeg.
---

diff --git a/opera/opera.SlackBuild b/opera/opera.SlackBuild
index 5930fc4..442481f 100755
--- a/opera/opera.SlackBuild
+++ b/opera/opera.SlackBuild
@@ -22,7 +22,7 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# If your want to make a different flavour of Opera, change this variable.
+# If your want to make a different flavor of Opera, change this variable.
 # For now there are two valid choices: "beta" and "developer".
 FLAVOR=-${FLAVOR:-beta}
 
@@ -109,7 +109,7 @@ build_ffmpeg() {
     rm -rf ${PKG}${FFMPEG_DIR}/{pkgconfig,include}
 
     # Add path to ffmpeg libs to launcher
-    sed -i "s/PATH_TO_FFMPEG/$(echo ${FFMPEG_DIR} | sed 's/\//\\\//g')/" /${PKG}/usr/bin/opera${FLAVOR}
+    sed -i "s/PATH_TO_FFMPEG/$(echo ${FFMPEG_DIR} | sed 's/\//\\\//g')/" ${PKG}/usr/bin/opera${FLAVOR}
 }
 
 # Exit on most errors
@@ -158,6 +158,8 @@ mv usr etc $PKG/
 
 if [ "${FFMPEG}" == "yes" ]; then
     build_ffmpeg
+else
+    sed -i 's/PATH_TO_FFMPEG\://' ${PKG}/usr/bin/opera${FLAVOR}
 fi
 
 # Strip binaries and libraries