- Timestamp:
- 06/03/2007 09:06:13 AM (17 years ago)
- Branches:
- 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
- Children:
- 05760bc
- Parents:
- 350625a
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
CLFS2/master.sh
r350625a rf546320 218 218 # If $pkg_tarball isn't empty, we've got a package... 219 219 if [ "$pkg_tarball" != "" ] ; then 220 # Touch timestamp file if installed files logs will be created. 221 # But only for the firt build when running iterative builds. 222 if [ "${INSTALL_LOG}" = "y" ] ; then 223 LUSER_wrt_TouchTimestamp 224 fi 220 225 LUSER_wrt_unpack "$pkg_tarball" 221 226 # If using optimizations, write the instructions … … 225 230 LUSER_wrt_RunAsUser "${file}" 226 231 # 227 [[ "$pkg_tarball" != "" ]] && LUSER_RemoveBuildDirs "${name}" 232 # Write installed files log and remove the build directory(ies) 233 # except if the package build fails. 234 if [ "$pkg_tarball" != "" ] ; then 235 LUSER_RemoveBuildDirs "${name}" 236 if [ "${INSTALL_LOG}" = "y" ] ; then 237 LUSER_wrt_LogNewFiles "$name" 238 fi 239 fi 228 240 # 229 241 # Include a touch of the target name so make can check if it's already been made. … … 283 295 # 284 296 # If $pkg_tarball isn't empty, we've got a package... 285 [[ "$pkg_tarball" != "" ]] && LUSER_wrt_unpack "$pkg_tarball" 297 if [ "$pkg_tarball" != "" ] ; then 298 LUSER_wrt_unpack "$pkg_tarball" 299 if [ "${INSTALL_LOG}" = "y" ] ; then 300 LUSER_wrt_TouchTimestamp 301 fi 302 fi 286 303 # 287 304 LUSER_wrt_RunAsUser "${file}" 288 305 # 289 [[ "$pkg_tarball" != "" ]] && LUSER_RemoveBuildDirs "${name}" 306 if [ "$pkg_tarball" != "" ] ; then 307 LUSER_RemoveBuildDirs "${name}" 308 if [ "${INSTALL_LOG}" = "y" ] ; then 309 LUSER_wrt_LogNewFiles "$name" 310 fi 311 fi 290 312 # 291 313 # Include a touch of the target name so make can check if it's already been made. … … 351 373 # 352 374 # If $pkg_tarball isn't empty, we've got a package... 353 [[ "$pkg_tarball" != "" ]] && LUSER_wrt_unpack "$pkg_tarball" 375 if [ "$pkg_tarball" != "" ] ; then 376 LUSER_wrt_unpack "$pkg_tarball" 377 if [ "${INSTALL_LOG}" = "y" ] ; then 378 LUSER_wrt_TouchTimestamp 379 fi 380 fi 354 381 # 355 382 # Select a script execution method … … 368 395 # 369 396 # Housekeeping...remove any build directory(ies) except if the package build fails. 370 [[ "$pkg_tarball" != "" ]] && LUSER_RemoveBuildDirs "${name}" 397 if [ "$pkg_tarball" != "" ] ; then 398 LUSER_RemoveBuildDirs "${name}" 399 if [ "${INSTALL_LOG}" = "y" ] ; then 400 LUSER_wrt_LogNewFiles "$name" 401 fi 402 fi 371 403 # 372 404 # Include a touch of the target name so make can check if it's already been made.
Note:
See TracChangeset
for help on using the changeset viewer.