Chameleon Commit Details - 1793 - Chameleon open source boot loader project.

Date:

2012-01-13 00:10:03 (12 years 3 months ago)

Author:

blackosx

Commit:

1793

Parents:

1792

Message:

Attempt to overcome issue 211 by revising the code to remove all package .svn files before function makeSubstitutions() is called. The line it replaces should work but I can't figure out why it doesn't...

Changes:

M	/branches/blackosx/package/buildpkg.sh

File differences

-916
917 917
918 918
919 
919
920
921
922
923
920 924
921 925
922 926
+    ditto --noextattr --noqtn "${PKGROOT}/Resources" "${PKG_BUILD_DIR}/${packagename}/Resources"␊
␊
#   CleanUp the directory␊
    find "${PKG_BUILD_DIR}/${packagename}" \( -type d -name '.svn' \) -o -name '.DS_Store' -exec rm -rf {} \;␊
    #find "${PKG_BUILD_DIR}/${packagename}" \( -type d -name '.svn' \) -o -name '.DS_Store' -exec rm -rf {} \;␊
    find "${PKG_BUILD_DIR}/${packagename}/Resources" -name ".svn" -type d -o -name ".DS_Store" -type f | while read component␊
    do␊
␉␉rm -rf "${component}"␊
    done    ␊
␊
    # Make substitutions like version, revision, stage, developers, credits, etc..␊
    makeSubstitutions $( find "${PKG_BUILD_DIR}/${packagename}/Resources" -type f )␊
     ditto --noextattr --noqtn "${PKGROOT}/Resources" "${PKG_BUILD_DIR}/${packagename}/Resources"␊
 ␊
 #   CleanUp the directory␊
-    find "${PKG_BUILD_DIR}/${packagename}" \( -type d -name '.svn' \) -o -name '.DS_Store' -exec rm -rf {} \;␊
+    #find "${PKG_BUILD_DIR}/${packagename}" \( -type d -name '.svn' \) -o -name '.DS_Store' -exec rm -rf {} \;␊
+    find "${PKG_BUILD_DIR}/${packagename}/Resources" -name ".svn" -type d -o -name ".DS_Store" -type f | while read component␊
+    do␊
+␉␉rm -rf "${component}"␊
+    done    ␊
 ␊
     # Make substitutions like version, revision, stage, developers, credits, etc..␊
     makeSubstitutions $( find "${PKG_BUILD_DIR}/${packagename}/Resources" -type f )␊

Download the corresponding diff file