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

Date:

2014-11-14 20:39:34 (9 years 5 months ago)

Author:

ErmaC

Commit:

2478

Parents:

2477

Message:

Fix "sed: RE error: illegal byte sequence", which turns out to be from feeding sed a TIFF file (buildpkg.sh)

Changes:

M	/trunk/package/buildpkg.sh
M	/trunk/CHANGES

File differences

-173
174 174
175 175
176
176 177
177 
178 
179 
178
179
180
181
182
183
180 184
181 185
182 186
+$chameleonSubsts␊
$ownSubst"␊
␊
    # HACK: Don't try to substitute in TIFF files!␊
    for file in "$@";do␊
        cp -pf "$file" "${file}.in"␊
        sed "$allSubst" "${file}.in" > "${file}"␊
        rm -f "${file}.in"␊
        if [ -z `echo "$file" | grep tiff` ]␊
        then␊
            cp -pf "$file" "${file}.in"␊
            sed "$allSubst" "${file}.in" > "${file}"␊
            rm -f "${file}.in"␊
        fi␊
    done␊
}␊
␊
 $chameleonSubsts␊
 $ownSubst"␊
 ␊
+    # HACK: Don't try to substitute in TIFF files!␊
     for file in "$@";do␊
-        cp -pf "$file" "${file}.in"␊
-        sed "$allSubst" "${file}.in" > "${file}"␊
-        rm -f "${file}.in"␊
+        if [ -z `echo "$file" | grep tiff` ]␊
+        then␊
+            cp -pf "$file" "${file}.in"␊
+            sed "$allSubst" "${file}.in" > "${file}"␊
+            rm -f "${file}.in"␊
+        fi␊
     done␊
 }␊
 ␊

-1
2
2 3
3 4
4 5
+- ErmaC : Rename decompress_lzvn function to lzvn_decode follow Apple source name.␊
- bitshoveler : Fix "sed: RE error: illegal byte sequence", which turns out to be from feeding sed a TIFF file (buildpkg.sh)␊
- bitshoveler : Make some constant arrays static; other minor fixes (acpi_patcher.c)␊
- bitshoveler : Make 'buffer' arg to aml_add_buffer 'const char *', was just 'char *' (aml_generator)␊
- bitshoveler : Various fixes to problems exposed by Clang static analyzer (picopng.c)␊
 - ErmaC : Rename decompress_lzvn function to lzvn_decode follow Apple source name.␊
+- bitshoveler : Fix "sed: RE error: illegal byte sequence", which turns out to be from feeding sed a TIFF file (buildpkg.sh)␊
 - bitshoveler : Make some constant arrays static; other minor fixes (acpi_patcher.c)␊
 - bitshoveler : Make 'buffer' arg to aml_add_buffer 'const char *', was just 'char *' (aml_generator)␊
 - bitshoveler : Various fixes to problems exposed by Clang static analyzer (picopng.c)␊