remove exporting, build/multilocale.py does that better now

migrate.sh

@@ -7,20 +7,18 @@ cd $HGBASE
 
 if [[ -z "$1" ]]
 then
-    echo "Usage: $0 [import|export|ini]"
+    echo "Usage: $0 [properties|manifest]"
     echo 
-    echo "  import                    Import en-US properties files from git."
-    echo "  export [LOCALE...]        Export specified locale's properties"
-    echo "                            files to git.  If no locale is given"
-    echo "                            export ar, fr and zh-TW."
-    echo "  ini [LOCALE...]           Add LOCALE to *.ini files for all apps"
+    echo "  properties                    Import en-US properties files from git."
+    echo "  manifests                     Import en-US manifests files from git."
     echo 
     echo "The import command uses jq.  Download from http://stedolan.github.com/jq/"
     exit 1
 fi
 
-if [[ "$1" == "import" ]]
+if [[ "$1" == "properties" ]]
 then
+    rm -rf ../apps/system/camera
     # migrate properties files
     for f in $(find .. -name "*.en-US.properties")
     do
@@ -29,6 +27,13 @@ then
         echo "importing $f"
         cp $f $new
     done
+    rm en-US/shared/branding/official/branding.properties
+    exit 0
+fi
+
+if [[ "$1" == "manifests" ]]
+then
+    rm -rf ../apps/system/camera
     # migrate manifest files
     for f in $(find ../apps ../showcase_apps ../external-apps  -name "manifest.webapp")
     do
@@ -40,65 +45,3 @@ then
     done
     exit 0
 fi
-
-if [[ "$1" == "export" ]]
-then
-    args=("$@")
-    locales=${args[@]:1}
-
-    if [[ -z $locales ]]
-    then
-        locales=( ar fr zh-TW )
-    fi
-
-    for en_git in $(find .. -name "*.en-US.properties")
-    do
-        for loc in $locales
-        do
-            echo "exporting target: ${en_git%.en-US.properties}.$loc.properties"
-            cp \
-              $HGBASE/$loc/$(echo $en_git | sed -e 's/..\///' -e 's/locales\///' -e 's/en-US.//') \
-              ${en_git//en-US/$loc} 2> /dev/null
-        done
-    done
-    exit 0
-fi
-
-if [[ "$1" == "ini" ]]
-then
-    args=("$@")
-    locales=${args[@]:1}
-
-    if [[ -z $locales ]]
-    then
-        locales=( ar fr zh-TW )
-    fi
-
-    for ini in $(find .. -name "*.ini")
-    do
-        if [[ -z $(grep "en-US.properties" $ini) ]]
-        then
-            continue
-        fi
-        for loc in $locales
-        do
-            if [[ -z $(grep "\[$loc\]" $ini) ]]
-            then
-                echo "[$loc] section is missing; adding..."
-                echo "[$loc]" >> $ini
-            fi
-            import_en=$(grep "en-US.properties" $ini)
-            import_loc=${import_en/en-US/$loc}
-            if [[ -z $(grep "$import_loc" $ini) ]]
-            then
-                _tmp=$(mktemp)
-                sed "/\[$loc\]/a $import_loc\n" $ini > "$_tmp"
-                mv $_tmp $ini
-            else
-                echo "$import_loc already in $ini"
-            fi
-        done
-    done
-    exit 0
-fi
-