File tree Expand file tree Collapse file tree 1 file changed +13
-5
lines changed Expand file tree Collapse file tree 1 file changed +13
-5
lines changed Original file line number Diff line number Diff line change @@ -24,6 +24,14 @@ execute () {
24
24
fi
25
25
}
26
26
27
+ # Executes first command passed &
28
+ # echo's it to the file passed as second argument
29
+ run_and_echo () {
30
+ eval $1
31
+ echo " $1 " >> $2
32
+ }
33
+
34
+
27
35
if [[ -n $( echo $SHELL | grep " zsh" ) ]] ; then
28
36
SHELLRC=~ /.zshrc
29
37
elif [[ -n $( echo $SHELL | grep " bash" ) ]] ; then
@@ -90,17 +98,17 @@ if [[ ! -n $(cat $SHELLRC | grep '# ffmpeg-build-script') ]]; then
90
98
sed -i ' s/execute cmake -DCMAKE_INSTALL_PREFIX:PATH=${WORKSPACE} ./execute cmake -DCMAKE_INSTALL_PREFIX:PATH=${WORKSPACE} -DBUILD_SHARED_LIBS=1 ./g' build-ffmpeg
91
99
92
100
AUTOINSTALL=yes ./build-ffmpeg --build
101
+
93
102
echo " Adding ffmpeg's libraries to LD_LIBRARY_PATH"
94
103
{
95
104
echo " "
96
105
echo " # ffmpeg-build-script"
97
- echo " export LD_LIBRARY_PATH=$( pwd) /workspace/lib:\$ LD_LIBRARY_PATH"
98
- echo " export PKG_CONFIG_PATH=$( pwd) /workspace/lib/pkgconfig:\$ (pkg-config --variable pc_path pkg-config)"
99
- echo " export PKG_CONFIG_LIBDIR=$( pwd) /workspace/lib/:\$ PKG_CONFIG_LIBDIR"
100
-
101
106
} >> $SHELLRC
107
+
108
+ run_and_echo " export LD_LIBRARY_PATH=$( pwd) /workspace/lib:\$ LD_LIBRARY_PATH" $SHELLRC
109
+ run_and_echo " export PKG_CONFIG_PATH=$( pwd) /workspace/lib/pkgconfig:\$ (pkg-config --variable pc_path pkg-config)" $SHELLRC
110
+ run_and_echo " export PKG_CONFIG_LIBDIR=$( pwd) /workspace/lib/:\$ PKG_CONFIG_LIBDIR" $SHELLRC
102
111
)
103
- source $SHELLRC
104
112
fi
105
113
106
114
spatialPrint " GUI and openGL extensions"
You can’t perform that action at this time.
0 commit comments