Eirik Hatlen / ctools

Commit 86e242033d452427d2f180d4252bdb2efb61f937

Authored by Jürgen Knödlseder
1 parent 8526dd15

Add sudo to install commands for Mac OS X package building and verification

Inline Side-by-side
Showing 2 changed files with 17 additions and 18 deletions
dev/pkgbuild-macosx.sh
  View file @86e2420
@@ -65,14 +65,14 @@ LOGFILE=$PWD/pkg_build.log @@ -65,14 +65,14 @@ LOGFILE=$PWD/pkg_build.log
65 # Secure installation directory # 65 # Secure installation directory #
66 # ============================= # 66 # ============================= #
67 if [ -d "$INSTALLDIR" ]; then 67 if [ -d "$INSTALLDIR" ]; then
68 - mv $INSTALLDIR $INSTALLDIR.backup 68 + sudo mv $INSTALLDIR $INSTALLDIR.backup
69 fi 69 fi
70 70
71 71
72 # ======================= # 72 # ======================= #
73 # Clean package directory # 73 # Clean package directory #
74 # ======================= # 74 # ======================= #
75 -rm -rf $INSTALLDIR 75 +sudo rm -rf $INSTALLDIR
76 rm -rf $PKGDIR 76 rm -rf $PKGDIR
77 rm -rf $PRODDIR 77 rm -rf $PRODDIR
78 rm -rf $DMGFILE 78 rm -rf $DMGFILE
@@ -104,7 +104,7 @@ fi @@ -104,7 +104,7 @@ fi
104 cd $NCURSES 104 cd $NCURSES
105 ./configure --prefix=$INSTALLDIR --with-shared | tee -a $LOGFILE 105 ./configure --prefix=$INSTALLDIR --with-shared | tee -a $LOGFILE
106 make -j4 | tee -a $LOGFILE 106 make -j4 | tee -a $LOGFILE
107 -make install | tee -a $LOGFILE 107 +sudo make install | tee -a $LOGFILE
108 make clean 108 make clean
109 109
110 110
@@ -125,7 +125,7 @@ fi @@ -125,7 +125,7 @@ fi
125 cd $READLINE 125 cd $READLINE
126 ./configure --prefix=$INSTALLDIR | tee -a $LOGFILE 126 ./configure --prefix=$INSTALLDIR | tee -a $LOGFILE
127 make -j4 | tee -a $LOGFILE 127 make -j4 | tee -a $LOGFILE
128 -make install | tee -a $LOGFILE 128 +sudo make install | tee -a $LOGFILE
129 make clean 129 make clean
130 130
131 131
@@ -146,7 +146,7 @@ fi @@ -146,7 +146,7 @@ fi
146 cd cfitsio 146 cd cfitsio
147 ./configure --prefix=$INSTALLDIR | tee -a $LOGFILE 147 ./configure --prefix=$INSTALLDIR | tee -a $LOGFILE
148 make -j4 shared | tee -a $LOGFILE 148 make -j4 shared | tee -a $LOGFILE
149 -make install | tee -a $LOGFILE 149 +sudo make install | tee -a $LOGFILE
150 make clean 150 make clean
151 151
152 152
@@ -201,7 +201,7 @@ fi @@ -201,7 +201,7 @@ fi
201 # Build code 201 # Build code
202 ./configure --prefix=$INSTALLDIR | tee -a $LOGFILE 202 ./configure --prefix=$INSTALLDIR | tee -a $LOGFILE
203 make -j4 | tee -a $LOGFILE 203 make -j4 | tee -a $LOGFILE
204 -make install | tee -a $LOGFILE 204 +sudo make install | tee -a $LOGFILE
205 make clean 205 make clean
206 206
207 207
@@ -245,9 +245,9 @@ if [ -d ".git" ]; then @@ -245,9 +245,9 @@ if [ -d ".git" ]; then
245 ./autogen.sh 245 ./autogen.sh
246 fi 246 fi
247 # Build code 247 # Build code
248 -./configure --prefix=$INSTALLDIR | tee $LOGFILE  
249 -make -j4 | tee $LOGFILE  
250 -make install | tee $LOGFILE 248 +./configure --prefix=$INSTALLDIR | tee -a $LOGFILE
  249 +make -j4 | tee -a $LOGFILE
  250 +sudo make install | tee -a $LOGFILE
251 make clean 251 make clean
252 252
253 253
@@ -258,14 +258,14 @@ make clean @@ -258,14 +258,14 @@ make clean
258 for file in ${INSTALLDIR}/lib/*.dylib 258 for file in ${INSTALLDIR}/lib/*.dylib
259 do 259 do
260 echo $file | tee -a $LOGFILE 260 echo $file | tee -a $LOGFILE
261 - install_name_tool -change "@rpath/libcfitsio.5.dylib" "$INSTALLDIR/lib/libcfitsio.5.dylib" $file 261 + sudo install_name_tool -change "@rpath/libcfitsio.5.dylib" "$INSTALLDIR/lib/libcfitsio.5.dylib" $file
262 done 262 done
263 263
264 # Change links in binaries 264 # Change links in binaries
265 for file in ${INSTALLDIR}/bin/ct* 265 for file in ${INSTALLDIR}/bin/ct*
266 do 266 do
267 echo $file | tee -a $LOGFILE 267 echo $file | tee -a $LOGFILE
268 - install_name_tool -change "@rpath/libcfitsio.5.dylib" "$INSTALLDIR/lib/libcfitsio.5.dylib" $file 268 + sudo install_name_tool -change "@rpath/libcfitsio.5.dylib" "$INSTALLDIR/lib/libcfitsio.5.dylib" $file
269 done 269 done
270 270
271 # Change links in Python modules 271 # Change links in Python modules
@@ -279,14 +279,14 @@ do @@ -279,14 +279,14 @@ do
279 for file in ${INSTALLDIR}/lib/$python/site-packages/gammalib/_*.so 279 for file in ${INSTALLDIR}/lib/$python/site-packages/gammalib/_*.so
280 do 280 do
281 echo $file | tee -a $LOGFILE 281 echo $file | tee -a $LOGFILE
282 - install_name_tool -change "@rpath/libcfitsio.5.dylib" "$INSTALLDIR/lib/libcfitsio.5.dylib" $file 282 + sudo install_name_tool -change "@rpath/libcfitsio.5.dylib" "$INSTALLDIR/lib/libcfitsio.5.dylib" $file
283 done 283 done
284 284
285 # Change links in ctools modules 285 # Change links in ctools modules
286 for file in ${INSTALLDIR}/lib/$python/site-packages/ctools/_*.so 286 for file in ${INSTALLDIR}/lib/$python/site-packages/ctools/_*.so
287 do 287 do
288 echo $file | tee -a $LOGFILE 288 echo $file | tee -a $LOGFILE
289 - install_name_tool -change "@rpath/libcfitsio.5.dylib" "$INSTALLDIR/lib/libcfitsio.5.dylib" $file 289 + sudo install_name_tool -change "@rpath/libcfitsio.5.dylib" "$INSTALLDIR/lib/libcfitsio.5.dylib" $file
290 done 290 done
291 done 291 done
292 292
@@ -306,14 +306,14 @@ pkgbuild --identifier cta.irap.omp.eu.ctools.pkg \ @@ -306,14 +306,14 @@ pkgbuild --identifier cta.irap.omp.eu.ctools.pkg \
306 # ======================= # 306 # ======================= #
307 # Clean package directory # 307 # Clean package directory #
308 # ======================= # 308 # ======================= #
309 -rm -rf $INSTALLDIR 309 +sudo rm -rf $INSTALLDIR
310 310
311 311
312 # ============================== # 312 # ============================== #
313 # Recover installation directory # 313 # Recover installation directory #
314 # ============================== # 314 # ============================== #
315 if [ -d "$INSTALLDIR.backup" ]; then 315 if [ -d "$INSTALLDIR.backup" ]; then
316 - mv $INSTALLDIR.backup $INSTALLDIR 316 + sudo mv $INSTALLDIR.backup $INSTALLDIR
317 fi 317 fi
318 318
319 319
@@ -397,6 +397,5 @@ hdiutil create -volname $CTOOLS \ @@ -397,6 +397,5 @@ hdiutil create -volname $CTOOLS \
397 # ======================= # 397 # ======================= #
398 # Clean package directory # 398 # Clean package directory #
399 # ======================= # 399 # ======================= #
400 -rm -rf $INSTALLDIR  
401 rm -rf $PKGDIR 400 rm -rf $PKGDIR
402 rm -rf $PRODDIR 401 rm -rf $PRODDIR
dev/pkgcheck-macosx.sh
  View file @86e2420
@@ -54,7 +54,7 @@ LOGFILE=$PWD/pkg_check.log @@ -54,7 +54,7 @@ LOGFILE=$PWD/pkg_check.log
54 # Secure installation directory # 54 # Secure installation directory #
55 # ============================= # 55 # ============================= #
56 if [ -d "$INSTALLDIR" ]; then 56 if [ -d "$INSTALLDIR" ]; then
57 - mv $INSTALLDIR $INSTALLDIR.backup 57 + sudo mv $INSTALLDIR $INSTALLDIR.backup
58 fi 58 fi
59 59
60 60
@@ -106,5 +106,5 @@ sudo rm -rf $INSTALLDIR @@ -106,5 +106,5 @@ sudo rm -rf $INSTALLDIR
106 # Recover installation directory # 106 # Recover installation directory #
107 # ============================== # 107 # ============================== #
108 if [ -d "$INSTALLDIR.backup" ]; then 108 if [ -d "$INSTALLDIR.backup" ]; then
109 - mv $INSTALLDIR.backup $INSTALLDIR 109 + sudo mv $INSTALLDIR.backup $INSTALLDIR
110 fi 110 fi