Rewrite deploy.bash.

Author: liudng

README.md

@@ -104,6 +104,26 @@ In the above command, **demo** is cmd-file. **helloworld** is cmd-function.
 
 More examples, see the files in th [cmd](https://github.com/liudng/dev/tree/master/cmd) directory.
 
+## The Library Scripts
+
+Import a library script to current command file, Add following line to file start:
+
+```sh
+dev_import dev file
+```
+
+It will load the script file from dev project's lib/file.bash.
+
+## Global Variables Reference
+
+* `$dev_global_project` The project name.
+* `$dev_global_base` The project base directory.
+
+## Global Functions Reference
+
+* `dev_import` Import a library file to current file.
+* `dev_run`
+
 ## Multi-project
 
 Using [dev](https://github.com/liudng/dev) to manage multiple projects is very easy.
@@ -114,6 +134,6 @@ More project examples, see the [sys](https://github.com/liudng/sys) project.
 
 ## Copyright
 
-Copyright 2017 The [dev](https://github.com/liudng/dev) Authors. All rights reserved.
+Copyright 2018 The [dev](https://github.com/liudng/dev) Authors. All rights reserved.
 
 Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

bin/dev-bootstrap.bash

@@ -44,7 +44,7 @@ dev_kernel_optional_arguments() {
 }
 
 # The dev package version
-declare -gr dev_global_version="2.0.1"
+declare -gr dev_global_version="2.1.0"
 
 # The dev execution file path
 declare -gr dev_global_self="$(realpath $0)"

cmd/deploy.bash

@@ -0,0 +1,112 @@
+# Copyright 2017 The dev Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+dev_import dev io
+dev_import dev network
+
+cmd_init() {
+    [ -z "$1" ] && echo "Usage: dev deploy init <prj>" >&2 && return 1
+
+    declare prj="$1" wkdir="${dev_conf_projects[$1]}"
+
+    if [[ -z "${dev_conf_projects[$1]}" ]]; then
+        dev_error "Project not found, add the following line to $dev_global_base/etc/dev.conf:" >&2
+        dev_error "  [$prj]=/home/ld/$prj" >&2
+        return 1
+    fi
+
+    mkdir -p $HOME/bin $HOME/.local/{bin,lib,lib64,share}
+    mkdir -p $wkdir/{bin,cmd,etc,lib,src,usr} $wkdir/var/downloads
+    mkdir -m a+w -p $wkdir/var/{log,tmp}
+
+    if [ ! -f $HOME/.bash_completion ]; then
+        touch $HOME/.bash_completion
+    fi
+
+    if [ -f $dev_global_base/share/completion.bash ]; then
+        grep -q "_dev_init_completion" $HOME/.bash_completion || \
+            cat $dev_global_base/share/completion.bash >> $HOME/.bash_completion
+    fi
+
+    grep -q "complete -F _dev_init_completion $prj" $HOME/.bash_completion || \
+        echo "complete -F _dev_init_completion $prj" >> $HOME/.bash_completion
+
+    if [ ! -f $wkdir/bin/$prj.bash ]; then
+        echo "dev-bootstrap $prj \$@" > $wkdir/bin/$prj.bash
+        chmod a+x $wkdir/bin/$prj.bash
+    fi
+
+    if [ ! -L $wkdir/bin/$prj ]; then
+        cd $wkdir/bin
+        ln -s $prj.bash $prj
+    fi
+
+    [ -L $HOME/bin/dev ] || ln -s $dev_global_base/bin/dev.bash $HOME/bin/dev
+    [ -L $HOME/bin/dev-bootstrap ] || ln -s $dev_global_base/bin/dev-bootstrap.bash $HOME/bin/dev-bootstrap
+
+    [ -L $HOME/bin/$prj ] || ln -s $wkdir/bin/$prj.bash $HOME/bin/$prj
+
+    if [ ! -f $wkdir/.gitignore ]; then
+        echo "/src" > $wkdir/.gitignore
+        echo "/usr" >> $wkdir/.gitignore
+        echo "/var" >> $wkdir/.gitignore
+    fi
+
+    cd $wkdir/usr
+
+    [ -L $wkdir/usr/etc ] || ln -s ../etc etc
+    [ -L $wkdir/usr/src ] || ln -s ../src src
+    [ -L $wkdir/usr/var ] || ln -s ../var var
+
+    dev_verbose "done"
+}
+
+#
+# Usage:
+#     dev deploy rsync <prj> <user_and_host>
+#
+cmd_rsync() {
+    if [[ $# -lt 2 ]]; then
+        dev_info "Usage: dev deploy rsync <prj> <user_and_host>" >&2
+        return 1;
+    fi
+
+    declare prj="$1" wkdir="${dev_conf_projects[$1]}" user_and_host="$2"
+
+    if [[ -z "${dev_conf_projects[$1]}" ]]; then
+        dev_error "Project not found, add the following line to $dev_global_base/etc/dev.conf:" >&2
+        dev_error "  [$prj]=/home/ld/$prj" >&2
+        return 1
+    fi
+
+    # -e to specify ssh instead of the default.
+    # rsync -aprzv -e ssh --include '*/' --include='*.class' --exclude='*' . server:/path
+
+    # -a, --archive               archive mode; equals -rlptgoD (no -H,-A,-X)
+    # -C, --cvs-exclude           auto-ignore files in the same way CVS does
+    # -d, --dirs                  transfer directories without recursing
+    # -l, --links                 copy symlinks as symlink
+    # -p, --perms                 preserve permissions
+    # -r, --recursive             recurse into directories
+    # -z, --compress              compress file data during the transfer
+    # --delete
+    rsync -alprz \
+        --delete \
+        --cvs-exclude \
+        --exclude-from=$dev_global_base/etc/rsync.excludes \
+        $wkdir $user_and_host:\$HOME
+}
+
+cmd_sudoer() {
+    [ $# -lt 2 ] && dev_error "Usage: dev deploy sudoer <sudoer> <user_and_host>" >&2 && return 1
+
+    declare sudoer="$1" user_and_host="$2"
+
+    dev_scp $glb_wkdir/share/sudoer.bash $user@$host:\$HOME
+
+    cmd="chmod a+x \$HOME/sudoer.bash; \$HOME/sudoer.bash $sudoer; rm \$HOME/sudoer.bash"
+    dev_ssh $user@$host "$cmd"
+
+    dev_verbose "done"
+}

cmd/deploy/deploy.bash

@@ -17,7 +17,14 @@ cmd_sleep() {
 }
 
 cmd_basename() {
-    dev_basename "abc-1.2.0.tar.gz"
-    dev_basename "abc-1.2.0.tar.bz2"
-    dev_basename "abc-1.2.0.tgz"
+    echo "file-1.2.0.tar.gz"
+    dev_file_basename "file-1.2.0.tar.gz"
+    echo "file-1.2.0.tar.bz2"
+    dev_file_basename "file-1.2.0.tar.bz2"
+    echo "file-1.2.0.tgz"
+    dev_file_basename "file-1.2.0.tgz"
+}
+
+cmd_interactive() {
+    [[ $- == *i* ]] && echo 'Interactive' || echo 'Not interactive'
 }

cmd/deploy/init.bash

@@ -1,6 +1,5 @@
-.git
 etc/dev.conf
-src/*
+src/
 tags
-usr/*
-var/*
+usr/
+var/

cmd/deploy/rsync.bash

@@ -1,8 +1,13 @@
-#!/bin/bash
 # Copyright 2017 The dev Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
+# trace ERR through pipes
+set -o pipefail
+
+# set -e : exit the script if any statement returns a non-true return value
+set -o errexit
+
 [ $# -lt 1 ] && echo "Usage: dev sudoer <sudoer>" >&2 && return 1
 
 declare sudoer="$1" home="/home/$1"