Changeset a180dc7


Ignore:
Timestamp:
10/03/13 16:31:12 (10 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
9d437ac
Parents:
1934da2
Message:

Fix some issues staging files and make sure to create wrappers on
sym-links

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pbi-manager10/pbi-manager

    r1934da2 ra180dc7  
    36103610                if [ ! -f "$line" -o -h "$line" ] ; then continue ; fi 
    36113611                 
    3612                 # Make sure this isn't a binary executable 
    3613                 file "${line}" | grep "executable," >/dev/null 2>/dev/null 
    3614                 if [ "$?" = "0" ] ; then continue ; fi 
    3615  
    3616                 # Ignore files / libs with the full PREFIX hard-coded 
    3617                 strings "${line}" | grep "${PBI_PROGDIRPATH}" >/dev/null 2>/dev/null 
    3618                 if [ "$?" = "0" ]; then continue ; fi 
    3619  
    36203612                # Check if this hash file is excluded 
    36213613                _hfound="0" 
     
    36323624                fi       
    36333625 
    3634                 # Get the file size 
    3635                 tSize=`du -k "${line}" | awk '{print $1}'` 
    3636                 if [ $(is_num "$tSize") ] ; then  
    3637                         # If the file is less than 10Kb, we can skip 
    3638                         if [ $tSize -lt 10 ] ; then continue ; fi 
    3639  
    3640                         # Add to the hash-dir 
    3641                         sha=`sha256 -q "$line"` 
    3642                         echo "${line}:::${sha}" >> ${2} 
    3643                 fi 
     3626                # Add to the hash-dir 
     3627                sha=`sha256 -q "$line"` 
     3628                echo "${line}:::${sha}" >> ${2} 
     3629 
    36443630        done < ${tmp_hashdir} 
    36453631        rm ${tmp_hashdir} 
     
    40554041 
    40564042        if [ "$2" = "move" ] ; then 
    4057                 mv ${cpDir}/* ${PBI_STAGEDIR}/local 
     4043                rmdir ${PBI_STAGEDIR}/local 
     4044                mv ${cpDir} ${PBI_STAGEDIR}/local 
     4045                ln -s ${PBI_STAGEDIR}/local /usr/local 
    40584046        else 
    40594047                # Now copy the stagedir 
     
    40884076        if [ "${PBI_USESYSFONTS}" != "NO" ] ; then 
    40894077                rm -rf ${PBI_STAGEDIR}/share/icons >/dev/null 2>/dev/null 
     4078                mkdir ${PBI_STAGEDIR}/share/icons >/dev/null 2>/dev/null 
    40904079        fi 
    40914080} 
Note: See TracChangeset for help on using the changeset viewer.