revise setAU files

2 files changed, 79 insertions, 31 deletions

diff --git a/examples/setAU-ARM.sh b/examples/setAU-ARM.sh
new file mode 100755
index 0000000..95b9e2b
--- /dev/null
+++ b/examples/setAU-ARM.sh
@@ -0,0 +1,73 @@
+#!/bin/bash
+
+GITDIR=$PWD
+NEWLANG="en_AU.UTF-8"
+
+# Flash support
+# cp $GITDIR/sub-files/libflashplayer.so $INSTALL_ROOT/usr/lib/mozilla/plugins/
+
+# add mi_lang_pack_v2 support
+#cp $GITDIR/mi_lang_pack_v2.sh $INSTALL_ROOT/home/olpc/
+
+###### SUGAR MODS ####### 
+mkdir -p $INSTALL_ROOT/home/olpc/.sugar/default/
+
+###### OLPC MODS #########
+## olpc-utils - ensure TZ is set for all enviroments like tty1 tty2 REVIEW
+patch $INSTALL_ROOT/etc/profile.d/zzz_olpc.sh $GITDIR/olpc-utils/zzz_olpc.diff
+
+# custom olpc.fth to detected missing mfg-data tags
+# cp $GITDIR/olpc.fth $INSTALL_ROOT/boot/
+
+# add DejaVuOlpc-Regular.ttf to image
+mkdir $INSTALL_ROOT/usr/share/fonts/abc123
+cp $GITDIR/sub-files/abc123-Regular.ttf $INSTALL_ROOT/usr/share/fonts/abc123/
+cat << EOF > $INSTALL_ROOT/etc/fonts/conf.d/52-abc123.conf
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+  <!-- Generic name assignment -->
+  <alias>
+    <family>abc123</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+  <!-- Generic name aliasing -->
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>abc123</family>
+    </prefer>
+  </alias>
+</fontconfig>
+EOF
+
+###### SET  ######
+cat << EOF >> $INSTALL_ROOT/etc/sysconfig/i18n
+LANG=$NEWLANG
+LC_ALL=$NEWLANG
+EOF
+
+cat << EOF > $INSTALL_ROOT/home/olpc/.i18n
+LANG=$NEWLANG
+LC_ALL=$NEWLANG
+LANGUAGE=en_GB.utf8:en_US.utf8
+EOF
+
+###### OLPCAU MODS ######
+### patch in adobe and school font copyrite info
+patch $INSTALL_ROOT/usr/share/sugar/extensions/cpsection/aboutcomputer/view.py $GITDIR/copyrightF14dex.diff
+
+### move to rpms ###
+# sets inkscape
+cp -a $GITDIR/layout/.config $INSTALL_ROOT/home/olpc/
+# sets gimp
+cp -a $GITDIR/layout/.gimp-2.6 $INSTALL_ROOT/home/olpc/
+# set abiword
+cp -a $GITDIR/layout/.AbiSuite $INSTALL_ROOT/home/olpc/
+# set gtk-recordmydesktop
+#cp -a $GITDIR/layout/.gtk-recordmydesktop $INSTALL_ROOT/home/olpc/
+# set camorama
+#cp -a $GITDIR/layout/.gconf/ $INSTALL_ROOT/home/olpc/
+
diff --git a/examples/setAU.sh b/examples/setAU.sh
index 354289c..6733db2 100755
--- a/examples/setAU.sh
+++ b/examples/setAU.sh
@@ -4,37 +4,21 @@ GITDIR=$PWD
 NEWLANG="en_AU.UTF-8"
 
 # add mi_lang_pack_v2 support
-cp $GITDIR/mi_lang_pack_v2.sh $INSTALL_ROOT/root
-chroot $INSTALL_ROOT sh /root/mi_lang_pack_v2.sh
-rm $INSTALL_ROOT/root/mi_lang_pack_v2.sh
+#cp $GITDIR/mi_lang_pack_v2.sh $INSTALL_ROOT/home/olpc/
 
 ###### SUGAR MODS ####### 
 mkdir -p $INSTALL_ROOT/home/olpc/.sugar/default/
-#tar -jxvf $GITDIR/au.org.laptop.FirefoxEnGBActivity.tar.bz2 -C $INSTALL_ROOT/home/olpc/.sugar/default/
+tar -jxvf $GITDIR/au.org.laptop.FirefoxEnGBActivity.tar.bz2 -C $INSTALL_ROOT/home/olpc/.sugar/default/
 
 ###### OLPC MODS #########
-# patch olpc-configure to not play with ~/.18n or the below SET  
-# would be over written anyway, and fix for /etc/sysconfig/keyboard 
-### file upstream bug ###
-patch $INSTALL_ROOT/etc/rc.d/init.d/olpc-configure $GITDIR/olpc-utils/1-olpc-config.diff
-patch $INSTALL_ROOT/etc/rc.d/init.d/olpc-configure $GITDIR/olpc-utils/2-olpc-config.diff
-patch $INSTALL_ROOT/etc/rc.d/init.d/olpc-configure $GITDIR/olpc-utils/3-olpc-config.diff
-# patch $INSTALL_ROOT/etc/rc.d/init.d/olpc-configure $GITDIR/key.diff
-
 ## olpc-utils - ensure TZ is set for all enviroments like tty1 tty2 REVIEW
 patch $INSTALL_ROOT/etc/profile.d/zzz_olpc.sh $GITDIR/olpc-utils/zzz_olpc.diff
 
-# halt sets the hwclock but not to utc, just disable. REVIEW
-patch $INSTALL_ROOT/etc/rc.d/init.d/halt $GITDIR/haltF14.diff
-
 # custom olpc.fth to detected missing mfg-data tags
-#cp $GITDIR/olpc.fth $INSTALL_ROOT/boot/
-
-# custom halt file
-cp $GITDIR/sub-files/halt $INSTALL_ROOT/etc/rc.d/init.d/
+# cp $GITDIR/olpc.fth $INSTALL_ROOT/boot/
 
 # add DejaVuOlpc-Regular.ttf to image
-mkdir $INSTALL_ROOT/usr/share/fonts/abc123-Regular
+mkdir $INSTALL_ROOT/usr/share/fonts/abc123
 cp $GITDIR/sub-files/abc123-Regular.ttf $INSTALL_ROOT/usr/share/fonts/abc123/
 cat << EOF > $INSTALL_ROOT/etc/fonts/conf.d/52-abc123.conf
 <?xml version="1.0" encoding="UTF-8"?>
@@ -70,15 +54,6 @@ LANGUAGE=en_GB.utf8:en_US.utf8
 EOF
 
 ###### OLPCAU MODS ######
-
-# hack around nodocs for cups
-#sed -i -e "s/%_excludedocs 1/#%_excludedocs 1/" $INSTALL_ROOT/etc/rpm/macros.imgcreate
-#rpm -ivh --force --root=$INSTALL_ROOT $GITDIR/build/cache/imgcreate/*f14*/packages/cups*
-#sed -i -e "s/#%_excludedocs 1/%_excludedocs 1/" $INSTALL_ROOT/etc/rpm/macros.imgcreate
-
-### patch FF not to load update screen
-#patch $INSTALL_ROOT/usr/lib/firefox-3.6/defaults/preferences/firefox-branding.js $GITDIR/brandingF14.diff
-
 ### patch in adobe and school font copyrite info
 patch $INSTALL_ROOT/usr/share/sugar/extensions/cpsection/aboutcomputer/view.py $GITDIR/copyrightF14dex.diff
 
@@ -90,7 +65,7 @@ cp -a $GITDIR/layout/.gimp-2.6 $INSTALL_ROOT/home/olpc/
 # set abiword
 cp -a $GITDIR/layout/.AbiSuite $INSTALL_ROOT/home/olpc/
 # set gtk-recordmydesktop
-cp -a $GITDIR/layout/.gtk-recordmydesktop $INSTALL_ROOT/home/olpc/
+#cp -a $GITDIR/layout/.gtk-recordmydesktop $INSTALL_ROOT/home/olpc/
 # set camorama
-cp -a $GITDIR/layout/.gconf/ $INSTALL_ROOT/home/olpc/
+#cp -a $GITDIR/layout/.gconf/ $INSTALL_ROOT/home/olpc/