From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 7 Feb 2011 04:00:55 +0000 (-0700)
Subject: Maintenance: Fix in icons update script
X-Git-Tag: take03^2~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54966be3644a6c4c2e63309f3df42df2850303d4;p=thirdparty%2Fsquid.git

Maintenance: Fix in icons update script
---

diff --git a/icons/list b/icons/list
index 441510b3ed..0e1fdb86b9 100644
--- a/icons/list
+++ b/icons/list
@@ -1,5 +1,4 @@
 ICONS= \
- \
     silk/application.png \
     silk/arrow_up.png \
     silk/bomb.png \
@@ -15,8 +14,8 @@ ICONS= \
     silk/database.png \
     silk/database_table.png \
     silk/drive_disk.png \
-    silk/film_key.png \
     silk/film.png \
+    silk/film_key.png \
     silk/folder.png \
     silk/folder_table.png \
     silk/image.png \
@@ -25,18 +24,18 @@ ICONS= \
     silk/layout.png \
     silk/link.png \
     silk/music.png \
-    silk/package_go.png \
     silk/package.png \
+    silk/package_go.png \
     silk/page_code.png \
     silk/page_excel.png \
     silk/page_green.png \
+    silk/page_white.png \
     silk/page_white_acrobat.png \
-    silk/page_white_cplusplus.png \
     silk/page_white_c.png \
+    silk/page_white_cplusplus.png \
     silk/page_white_flash.png \
     silk/page_white_magnify.png \
     silk/page_white_picture.png \
-    silk/page_white.png \
     silk/page_white_powerpoint.png \
     silk/page_white_stack.png \
     silk/page_white_text.png \
@@ -45,9 +44,8 @@ ICONS= \
     silk/page_world.png \
     silk/photo.png \
     silk/picture.png \
-    silk/plugin_add.png \
     silk/plugin.png \
+    silk/plugin_add.png \
+    silk/script.png \
     silk/script_gear.png \
-    silk/script_palette.png \
-    silk/script.png
-
+    silk/script_palette.png 
diff --git a/scripts/source-maintenance.sh b/scripts/source-maintenance.sh
index ac8e66c2cb..b60a1f7fe4 100755
--- a/scripts/source-maintenance.sh
+++ b/scripts/source-maintenance.sh
@@ -128,13 +128,15 @@ echo "#endif" >>${ROOT}/lib/profiler/list
 mv ${ROOT}/lib/profiler/list ${ROOT}/lib/profiler/xprof_type.h
 
 # Build icons install include form current icons available
-echo "ICONS= \\" >${ROOT}/icons/list
+(
+echo -n "ICONS="
 for f in `ls -1 ${ROOT}/icons/silk/*`
 do
-	echo " \\" >>${ROOT}/icons/list
-	echo -n "    ${f}" | sed s%${ROOT}/icons/%% >>${ROOT}/icons/list
+	echo " \\"
+	echo -n "    ${f}"
 done
-echo " " >>${ROOT}/icons/list
+echo " "
+)| sed s%${ROOT}/icons/%%g >${ROOT}/icons/list
 
 # Run formating
 echo "" >${ROOT}/doc/debug-sections.tmp