From f77f690751552b2e1708c63a5177b318bcbf94ea Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 21 May 2018 16:15:36 +0200 Subject: [PATCH 1/4] change proj-head docu for script --- doc/proj-head | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/proj-head b/doc/proj-head index 2b70ea3..8b02794 100755 --- a/doc/proj-head +++ b/doc/proj-head @@ -3,6 +3,6 @@ [ -d "" ] || { echo "LIBDIR not exist"; exit 1; } # -# . -> -> -source /proj/ +# +source /proj/ project_relation=" $project_relation" From 10dce09e4dbcee16c8daad16b3425893c92144af Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 21 May 2018 16:16:07 +0200 Subject: [PATCH 2/4] add proj gen script --- script/add_project.sh | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100755 script/add_project.sh diff --git a/script/add_project.sh b/script/add_project.sh new file mode 100755 index 0000000..5205581 --- /dev/null +++ b/script/add_project.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +#check param +[ -z "$1" ] && { echo "$0 \"name\" [base]"; exit 1; } +name="$1" +base="$2" + +#gen project +cp "doc/proj-head" "src/proj/$name" + +#set base_relations +if [ -z "$base" ]; then + base_relations="base" + base="base" + sed -i "/project_relation=/c\project_relation=\"\"" "src/proj/$name" +else + [ -f "src/proj/$base" ] || { + echo "BASE: $base dont exist" + exit 1 + } + #get base of $base + base_base=`grep '# . ->' src/proj/$base` + base_relations=`echo $base_base | sed "s/#\ \./$base/g"` +fi + +## replace strings +# . -> -> base +sed -i "s//\ \.\ ->\ $base_relations/g" "src/proj/$name" +# +sed -i "s//$name/g" "src/proj/$name" +sed -i "s//$base/g" "src/proj/$name" + +#open +editor "src/proj/$name" From 8990b7ea1e66cb0010a6ea4d6898c4680a6da21e Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 21 May 2018 16:16:22 +0200 Subject: [PATCH 3/4] add base template --- src/proj/base | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100755 src/proj/base diff --git a/src/proj/base b/src/proj/base new file mode 100755 index 0000000..6e03c0d --- /dev/null +++ b/src/proj/base @@ -0,0 +1,30 @@ +#!/bin/bash +#remaster lib +[ -d "" ] || { echo "LIBDIR not exist"; exit 1; } + +################## +##### B a s e #### +################## +# . +project_relation="" +[ -z "$project" ] && project=base + +#tools_add [chroot_dir] [tools_list] +function tools_add() { + echo "$project: tools_add ot available" +} + +#os_update [chroot_dir] +function os_update() { + echo "$project: os_update ot available" +} + +#proxy_enable [chroot_dir] [proxy_host] [proxy_port] +function proxy_enable() { + echo "$project: proxy_enable ot available" +} + +#dns_set [chroot_dir] [domain] [nameserver] +function dns_set() { + echo "$project: dns_set ot available" +} From 013edd6c0f345ff662bee56bb4e2383a591be4b7 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 21 May 2018 16:20:42 +0200 Subject: [PATCH 4/4] change debian template for script --- src/proj/debian | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/proj/debian b/src/proj/debian index 3ac9a45..299a347 100755 --- a/src/proj/debian +++ b/src/proj/debian @@ -2,11 +2,15 @@ #remaster lib [ -d "" ] || { echo "LIBDIR not exist"; exit 1; } +source /proj/base +#debian +# . -> base +project_relation="debian" + #################################### ##### Base Template D E B I A N #### #################################### -# . -project_relation="debian" + #tools_add [chroot_dir] [tools_list] function tools_add() {