From: Oleg Broytman <phd@phdru.name>
Date: Tue, 20 May 2014 01:40:20 +0000 (+0400)
Subject: Allow additional subdirectories
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=73f0868f1ebc3cd10ade53a9adbd959ba503aabe;p=git-scripts.git

Allow additional subdirectories
---

diff --git a/clone2current b/clone2current
index 583a895..4927783 100755
--- a/clone2current
+++ b/clone2current
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 if [ -z "$1" ]; then
-   echo "Usage: $0 repoistory" >&2
+   echo "Usage: $0 repoistory [directories]" >&2
    exit 1
 fi
 
@@ -13,6 +13,11 @@ if [ ! -d ".git" ]; then
 fi &&
 
 cd "$HOME"/current/projects &&
+directories="$2" &&
+if [ -n "$directories" ]; then
+   mkdir -p "$directories" && cd "$directories"
+fi &&
+
 dest_dir="`basename \"$source_dir\"`" &&
 git clone "$source_dir" "$dest_dir" &&
 
@@ -26,4 +31,7 @@ else
 fi &&
 
 cd "$source_dir" &&
+if [ -n "$directories" ]; then
+   dest_dir="$directories/$dest_dir"
+fi &&
 exec git remote add current "$HOME"/current/projects/"$dest_dir"
diff --git a/publish2web b/publish2web
index c6d2add..eff60e3 100755
--- a/publish2web
+++ b/publish2web
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 if [ -z "$1" ]; then
-   echo "Usage: $0 repoistory" >&2
+   echo "Usage: $0 repoistory [directories]" >&2
    exit 1
 fi
 
@@ -20,7 +20,7 @@ git clone --mirror --config core.sharedRepository=0644 "$source_dir" "$dest_dir"
 cd "$dest_dir" &&
 git gc --aggressive && git fsck --strict &&
 cp -p hooks/post-update.sample hooks/post-update && hooks/post-update &&
-cp -p "$HOME"/Internet/WWW/htdocs/git.phdru.name/phdru.name.git/git-daemon-export-ok . &&
+cp -p "$HOME"/Internet/WWW/htdocs/git.phdru.name/phdru.name/phdru.name.git/git-daemon-export-ok . &&
 if [ "`cat \"$source_dir\"/.git/description`" = \
    "Unnamed repository; edit this file 'description' to name the repository." ]
 then
@@ -32,9 +32,18 @@ if [ -f "$source_dir"/README.html ]; then
    cp -p "$source_dir"/README.html . && chmod a+r README.html
 fi &&
 
-cd .. &&
-mv "$dest_dir" "$HOME"/Internet/WWW/htdocs/git.phdru.name &&
+cd "$HOME"/Internet/WWW/htdocs/git.phdru.name &&
+directories="$2" &&
+if [ -n "$directories" ]; then
+   mkdir -p "$directories"
+fi &&
+
+cd "$HOME"/tmp &&
+mv "$dest_dir" "$HOME"/Internet/WWW/htdocs/git.phdru.name/"$directories" &&
 
 umask 077 &&
 cd "$source_dir" &&
+if [ -n "$directories" ]; then
+   dest_dir="$directories/$dest_dir"
+fi &&
 exec git remote add --mirror=push web "$HOME"/Internet/WWW/htdocs/git.phdru.name/"$dest_dir"