Keep default skin pristine; inherit from default_conifer instead; drop _test skins...

git-svn-id: svn://svn.open-ils.org/ILS-Contrib/conifer/branches/rel_1_6_0@783 6d9bc8c9-1ec2-4278-b937-99fde70a366f

diff --git a/tools/patch_conifer.sh b/tools/patch_conifer.sh
index 1012476..8df01ca 100644 (file)
--- a/tools/patch_conifer.sh
+++ b/tools/patch_conifer.sh
@@ -53,44 +53,45 @@ copy_web_common()
 copy_opac_skins()
 {
        SKINS=`cd "$LOCAL_EXPORT_DIR"/"$BRANCH"/web/opac/skin; ls -1`
-       SKINS="default default_conifer $SKINS"
+       # Get rid of "default", add "default_conifer" first
+       SKINS=`echo "default_conifer $SKINS" | sed -e 's/default //' -`
        LINKS=`cd "$INSTALL_DIR"/var/web/opac/skin/default/; find xml -type l -print`
 
-       # For skins, create a _test variation of each
+       # For each skin:
        # 1. Copy the default skin in place first
-       # 2. Copy our custom default files over top of default_conifer, creating default_conifer_test
-       # 3. Copy the default_test skin into place as "$skin"_test
-       # 4. Copy the custom skin files over top "$skin"_test
+       # 2. Copy our custom default files over top of default_conifer, creating default_conifer
+       # 3. Copy the default_conifer skin into place as "$skin"
+       # 4. Copy the custom skin files over top "$skin"
 
-       # Munge the links to point to default_test for rdetail.js
-       # Munge the links to point to "$skin"_test for all
+       # Munge the links to point to default_conifer for rdetail.js
+       # Munge the links to point to "$skin" for all
        for skin in $SKINS
        do
-               rm -fr "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test
+               rm -fr "$INSTALL_DIR"/var/web/opac/skin/"$skin"
                if [ "$skin" == "default_conifer" ]
                then
-                       cp -r "$CANONICAL_EXPORT_DIR"/Open-ILS/web/opac/skin/default "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test
+                       cp -r "$CANONICAL_EXPORT_DIR"/Open-ILS/web/opac/skin/default "$INSTALL_DIR"/var/web/opac/skin/"$skin"
+                       cp -r "$LOCAL_EXPORT_DIR"/"$BRANCH"/web/opac/skin/default/* "$INSTALL_DIR"/var/web/opac/skin/"$skin"/.
                else
-                       cp -r "$INSTALL_DIR"/var/web/opac/skin/default_conifer_test "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test
+                       cp -r "$INSTALL_DIR"/var/web/opac/skin/default_conifer "$INSTALL_DIR"/var/web/opac/skin/"$skin"
+                       cp -r "$LOCAL_EXPORT_DIR"/"$BRANCH"/web/opac/skin/"$skin"/* "$INSTALL_DIR"/var/web/opac/skin/"$skin"/.
                fi
 
-               cp -r "$LOCAL_EXPORT_DIR"/"$BRANCH"/web/opac/skin/"$skin"/* "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/.
-
                for xml_link in $LINKS
                do
-                       cd "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/xml
-                       ln -sf index.xml `basename "$xml_link"`
+                       cd "$INSTALL_DIR"/var/web/opac/skin/"$skin"/xml
+                       ln -sf index.xml `basename $xml_link`
                done
 
                # Point at theme-specific JS, as we have our own copies
                for munge_file in 'page_rdetail.xml' 'page_mresult.xml' 'page_rresult.xml'
                do
-                       sed -i -e "s/skin\/default_conifer\/js/skin\/$skin\_test\/js/" "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/xml/"$munge_file"
-                       sed -i -e "s/skin\/default_conifer_test\/js/skin\/$skin\_test\/js/" "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/xml/"$munge_file"
+                       sed -i -e "s/skin\/default_conifer\/js/skin\/$skin\\/js/" "$INSTALL_DIR"/var/web/opac/skin/"$skin"/xml/"$munge_file"
+                       sed -i -e "s/skin\/default_conifer\/js/skin\/$skin\/js/" "$INSTALL_DIR"/var/web/opac/skin/"$skin"/xml/"$munge_file"
                done
-               sed -i -e "s/\/$skin\/css\/layout.css/\/$skin\_test\/css\/layout.css/" "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/xml/common/css_common.xml
+               sed -i -e "s/\/$skin\/css\/layout.css/\/$skin\\/css\/layout.css/" "$INSTALL_DIR"/var/web/opac/skin/"$skin"/xml/common/css_common.xml
 
-               sed -i -e 's/var googleBooksLink = true/var googleBooksLink = false/' "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/js/result_common.js
+               sed -i -e 's/var googleBooksLink = true/var googleBooksLink = false/' "$INSTALL_DIR"/var/web/opac/skin/"$skin"/js/result_common.js
 
                # Make global config default to grouping metarecords and formats
                # sed -i -e 's/var SHOW_MR_DEFAULT = false/var SHOW_MR_DEFAULT = true/' "$INSTALL_DIR"/var/web/opac/common/js/config.js
@@ -153,10 +154,10 @@ copy_conf_files()
 
 # Here end the functions; let the fun begin
 
-#update_repository
-#copy_web_common
+update_repository
+copy_web_common
 copy_opac_skins
-#copy_circ_rules
-#copy_xul
+copy_circ_rules
+copy_xul
 #copy_perl_modules
 #copy_conf_files