All of lore.kernel.org
 help / color / mirror / Atom feed
From: Robert Yang <liezhi.yang@windriver.com>
To: <openembedded-core@lists.openembedded.org>
Subject: [PATCH 3/8] oe-publish-sdk: make cmd easier to read
Date: Wed, 16 Nov 2016 22:19:32 -0800	[thread overview]
Message-ID: <de0d3cdc9adb339f4215237848c99a5d6974e260.1479363545.git.liezhi.yang@windriver.com> (raw)
In-Reply-To: <cover.1479363545.git.liezhi.yang@windriver.com>

The command was too long to read and maintain.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 scripts/oe-publish-sdk | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/scripts/oe-publish-sdk b/scripts/oe-publish-sdk
index 4fe8974..d95c623 100755
--- a/scripts/oe-publish-sdk
+++ b/scripts/oe-publish-sdk
@@ -113,10 +113,25 @@ def publish(args):
             return ret
 
     # Setting up the git repo
+    cmd_common = "if [ ! -e .git ]; then"
+    cmd_common += "    git init .;"
+    cmd_common += "    mv .git/hooks/post-update.sample .git/hooks/post-update;"
+    cmd_common += "    echo '*.pyc\n*.pyo' > .gitignore;"
+    cmd_common += "fi;"
+    cmd_common += "git add -A .;"
+    cmd_common += "git config user.email 'oe@oe.oe' && git config user.name 'OE' && git commit -q -m 'init repo' || true;"
     if not is_remote:
-        cmd = 'set -e; mkdir -p %s/layers; cd %s/layers; if [ ! -e .git ]; then git init .; mv .git/hooks/post-update.sample .git/hooks/post-update; echo "*.pyc\n*.pyo" > .gitignore; fi; git add -A .; git config user.email "oe@oe.oe" && git config user.name "OE" && git commit -q -m "init repo" || true; git update-server-info' % (destination, destination)
+        cmd = "set -e;"
+        cmd += "mkdir -p %s/layers;" % destination
+        cmd += "cd %s/layers;" % destination
+        cmd += cmd_common
+        cmd += "git update-server-info"
     else:
-        cmd = "ssh %s 'set -e; mkdir -p %s/layers; cd %s/layers; if [ ! -e .git ]; then git init .; mv .git/hooks/post-update.sample .git/hooks/post-update; echo '*.pyc\n*.pyo' > .gitignore; fi; git add -A .; git config user.email 'oe@oe.oe' && git config user.name 'OE' && git commit -q -m \"init repo\" || true; git update-server-info'" % (host, destdir, destdir)
+        cmd = "ssh %s 'set -e;" % host
+        cmd += "mkdir -p %s/layers;" % destdir
+        cmd += "cd %s/layers;" % destdir
+        cmd += cmd_common
+        cmd += "git update-server-info'"
     ret = subprocess.call(cmd, shell=True)
     if ret == 0:
         logger.info('SDK published successfully')
-- 
2.10.2



  parent reply	other threads:[~2016-11-17  6:19 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-17  6:19 [PATCH 0/8] Fixes for eSDK and testsdkext Robert Yang
2016-11-17  6:19 ` [PATCH 1/8] populate_sdk_ext.bbclass: install multilib targets as populate_sdk does Robert Yang
2016-12-13  4:55   ` Paul Eggleton
2016-12-13  6:03     ` Robert Yang
2016-12-14  2:25     ` Robert Yang
2016-12-14  2:34       ` Paul Eggleton
2016-11-17  6:19 ` [PATCH 2/8] oeqa/sdkext/devtool.py: remove workspace/sources before running test cases Robert Yang
2016-12-13  4:45   ` Paul Eggleton
2016-12-13  5:56     ` Robert Yang
2016-12-13  6:29       ` Paul Eggleton
2016-12-13  6:47         ` Robert Yang
2016-12-13  8:21           ` Paul Eggleton
2016-12-13  8:31             ` Robert Yang
2016-12-13 13:58     ` Lopez, Mariano
2016-11-17  6:19 ` Robert Yang [this message]
2016-11-17  6:19 ` [PATCH 4/8] oe-publish-sdk: add pyshtables.py to .gitignore Robert Yang
2016-12-13  4:59   ` Paul Eggleton
2016-12-13  6:03     ` Robert Yang
2016-11-17  6:19 ` [PATCH 5/8] oeqa/sdkext/devtool.py: don't reset when the test is failed Robert Yang
2016-12-13  4:48   ` Paul Eggleton
2016-12-13  6:01     ` Robert Yang
2016-12-13  6:33       ` Paul Eggleton
2016-12-13  6:39         ` Robert Yang
2016-12-13  8:07           ` Paul Eggleton
2016-12-13  8:09             ` Robert Yang
2016-11-17  6:19 ` [PATCH 6/8] oeqa/oetest.py: add hasLockedSig() Robert Yang
2016-11-17  6:19 ` [PATCH 7/8] oeqa/sdkext/devtool.py: skip test_extend_autotools_recipe_creation when no libxml2 Robert Yang
2016-11-17  6:19 ` [PATCH 8/8] oe/copy_buildsystem.py: add SDK_LAYERS_EXCLUDE_PATTERN Robert Yang
     [not found] ` <20161117065519.7693.7868@do.openembedded.org>
2016-11-17  9:02   ` ✗ patchtest: failure for Fixes for eSDK and testsdkext Burton, Ross
2016-11-17 17:12     ` Paul Eggleton
2016-11-29  7:38     ` Robert Yang
2016-11-29  9:10       ` Paul Eggleton
2016-12-13  2:58 ` [PATCH 0/8] " Robert Yang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=de0d3cdc9adb339f4215237848c99a5d6974e260.1479363545.git.liezhi.yang@windriver.com \
    --to=liezhi.yang@windriver.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.