[GitHub] houshengbo closed pull request #201: Add the root directory to each repo when packaging the source code

[GitBox <gi...@apache.org>]

houshengbo closed pull request #201: Add the root directory to each repo when packaging the source code
URL: https://github.com/apache/incubator-openwhisk-release/pull/201
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/tools/download_source_code.sh b/tools/download_source_code.sh
index 2df08a4..532a686 100755
--- a/tools/download_source_code.sh
+++ b/tools/download_source_code.sh
@@ -45,8 +45,9 @@ do
     HASH=$(json_by_key "$CONFIG" $HASH_KEY)
     REPO=$(json_by_key "$CONFIG" $REPO_KEY)
     BRANCH=$(json_by_key "$CONFIG" $REPO_BRANCH)
+    project_name="incubator-$repo_name"
     if [ "$HASH" != "null" ]; then
-        echo "The hash for $repo_name is $HASH"
-        git_clone_repo $repo_name $HASH $REPO $BRANCH
+        echo "The hash for $project_name is $HASH"
+        git_clone_repo $project_name $HASH $REPO $BRANCH
     fi
 done
diff --git a/tools/package_source_code.sh b/tools/package_source_code.sh
index 071428e..77295d6 100755
--- a/tools/package_source_code.sh
+++ b/tools/package_source_code.sh
@@ -35,7 +35,8 @@ rsync -rtp --exclude .bin --exclude .jshintrc --exclude .pydevproject --exclude
 for repo in $(echo $repos | sed "s/,/ /g")
 do
     repo_name=$(echo "$repo" | sed -e 's/^"//' -e 's/"$//')
-    cd $OPENWHISK_CLEANED_SOURCE_DIR/$repo_name
-    rm -rf .git
-    tar czf ${CURRENT_VERSION_DIR}/${repo_name}-${version}-sources.tar.gz .
+    project_name="incubator-$repo_name"
+    rm -rf $OPENWHISK_CLEANED_SOURCE_DIR/$project_name/.git
+    cd $OPENWHISK_CLEANED_SOURCE_DIR
+    tar czf ${CURRENT_VERSION_DIR}/${repo_name}-${version}-sources.tar.gz $project_name
 done
diff --git a/tools/verify_source_code.sh b/tools/verify_source_code.sh
index cc1c826..059c980 100755
--- a/tools/verify_source_code.sh
+++ b/tools/verify_source_code.sh
@@ -32,6 +32,7 @@ echo "Check the existence of LICENSE and NOTICE."
 for repo in $(echo $repos | sed "s/,/ /g")
 do
     repo_name=$(echo "$repo" | sed -e 's/^"//' -e 's/"$//')
-    echo "Check the repository $repo_name"
-    cd $OPENWHISK_SOURCE_DIR/$repo_name && ls {LICENSE*,NOTICE*}
+    project_name="incubator-$repo_name"
+    echo "Check the repository $project_name"
+    cd $OPENWHISK_SOURCE_DIR/$project_name && ls {LICENSE*,NOTICE*}
 done


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services