Only cherry-pick if really there is something to do.

[jprojects-scripts.git] / cp-dist.sh

diff --git a/cp-dist.sh b/cp-dist.sh
index 41cb9d6ae45e25c84481bab955782c7c861277d6..74cf41733d038e775a023becdaea6f92a9f4e83b 100755 (executable)
--- a/cp-dist.sh
+++ b/cp-dist.sh
@@ -7,17 +7,21 @@ for project in ${LIST}; do
        then
                echo "$0: Skipping jprojects-scripts ..."
                continue
-       elif [ -f "${project}/dist.sh" ]
+       elif [ -f "${JPROJECTS_HOME}/${project}/dist.sh" ]
        then
-               echo "$0: Copying dist.sh to '${project}' ..."
-               cp -v dist.sh "${project}/" || exit 255
+               echo "$0: Copying dist.sh/.git* to '${project}' ..."
+               cp -v dist.sh "${JPROJECTS_HOME}/${project}/" || exit 255
+               cp -vu "${JPROJECTS_HOME}/jprojects-scripts/.gitattributes" "${JPROJECTS_HOME}/${project}"
+               cp -vu "${JPROJECTS_HOME}/jprojects-scripts/.gitignore" "${JPROJECTS_HOME}/${project}"
        fi
 
-       if [ ! -d "${project}/docs" -o "$1" = "f" ]
+       if [ -d "${JPROJECTS_HOME}/${project}" -a ! -d "${JPROJECTS_HOME}/${project}/docs" -o "$1" = "f" ]
        then
                echo "$0: GNU-ifying project '${project}' ..."
-               mkdir --parent "${project}/docs" || exit 255
-               cp -rpv docs/* "${project}/docs/" || exit 255
+               mkdir --parent "${JPROJECTS_HOME}/${project}/docs" || exit 255
+               cp -rpv ${JPROJECTS_HOME}/jprojects-scripts/docs/* "${JPROJECTS_HOME}/${project}/docs/" || exit 255
+               cp -vu "${JPROJECTS_HOME}/jprojects-scripts/.gitignore" "${JPROJECTS_HOME}/${project}"
+               cp -vu "${JPROJECTS_HOME}/jprojects-scripts/.gitattributes" "${JPROJECTS_HOME}/${project}"
                cd "${JPROJECTS_HOME}/${project}"
                echo "$0: git add ..."
                git add docs || exit 255