From 1597bd303cf292a6d3e1198abd57f4bfdf23bcef Mon Sep 17 00:00:00 2001 From: Olof hagsand Date: Sun, 21 Jun 2020 15:57:43 +0200 Subject: [PATCH] changed cligen repo from olofhagsand/cligen to clicon/cligen --- configure | 5 +++-- configure.ac | 4 ++-- doc/CLI.md | 2 +- doc/DEVELOP.md | 2 +- doc/FAQ.md | 4 ++-- doc/INSTALL.md | 2 +- doc/README.md | 4 ++-- docker/base/Dockerfile | 2 +- docker/main/Dockerfile | 2 +- test/cicd/cicd.sh | 2 +- test/travis/before_script.sh | 2 +- test/vagrant/vagrant.sh | 2 +- 12 files changed, 17 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 4f6c306e..5623bfb0 100755 --- a/configure +++ b/configure @@ -4613,7 +4613,7 @@ if test "x$ac_cv_header_cligen_cligen_h" = xyes; then : _ACEOF else - as_fn_error $? "CLIgen missing. Try: git clone https://github.com/olofhagsand/cligen.git" "$LINENO" 5 + as_fn_error $? "CLIgen missing. Try: git clone https://github.com/clicon/cligen.git" "$LINENO" 5 fi done @@ -4663,7 +4663,7 @@ _ACEOF LIBS="-lcligen $LIBS" else - as_fn_error $? "CLIgen missing. Try: git clone https://github.com/olofhagsand/cligen.git" "$LINENO" 5 + as_fn_error $? "CLIgen missing. Try: git clone https://github.com/clicon/cligen.git" "$LINENO" 5 fi @@ -5068,6 +5068,7 @@ fi # Common actions for all restconf packages if test "x${with_restconf}" != "x"; then # This is for changing web user default www-data + # Should this be a runtime option? # Check whether --with-wwwuser was given. if test "${with_wwwuser+set}" = set; then : diff --git a/configure.ac b/configure.ac index 11c5a897..16a8f3c0 100644 --- a/configure.ac +++ b/configure.ac @@ -185,9 +185,9 @@ if test "$ac_enable_publish" = "yes"; then AC_DEFINE(CLIXON_PUBLISH_STREAMS, 1, [Enable publish of notification streams using SSE and curl]) fi -AC_CHECK_HEADERS(cligen/cligen.h,, AC_MSG_ERROR([CLIgen missing. Try: git clone https://github.com/olofhagsand/cligen.git])) +AC_CHECK_HEADERS(cligen/cligen.h,, AC_MSG_ERROR([CLIgen missing. Try: git clone https://github.com/clicon/cligen.git])) -AC_CHECK_LIB(cligen, cligen_init,, AC_MSG_ERROR([CLIgen missing. Try: git clone https://github.com/olofhagsand/cligen.git])) +AC_CHECK_LIB(cligen, cligen_init,, AC_MSG_ERROR([CLIgen missing. Try: git clone https://github.com/clicon/cligen.git])) # This is for restconf. There are three options: # --without-restconf No restconf support diff --git a/doc/CLI.md b/doc/CLI.md index 9275f16e..a831ae16 100644 --- a/doc/CLI.md +++ b/doc/CLI.md @@ -7,7 +7,7 @@ ## CLIgen -The Clixon CLI uses [CLIgen](http://github.com/olofhagsand/cligen) best described by the [CLIgen tutorial](https://github.com/olofhagsand/cligen/blob/master/cligen_tutorial.pdf). The [example](example) is also helpful. +The Clixon CLI uses [CLIgen](http://github.com/clicon/cligen) best described by the [CLIgen tutorial](https://github.com/clicon/cligen/blob/master/cligen_tutorial.pdf). The [example](example) is also helpful. Clixon adds some features and structure to CLIgen which include: * A plugin framework for both textual CLI specifications(.cli) and object files (.so) diff --git a/doc/DEVELOP.md b/doc/DEVELOP.md index 2614c4df..5cd5f5a6 100644 --- a/doc/DEVELOP.md +++ b/doc/DEVELOP.md @@ -54,7 +54,7 @@ configure.ac --. Makefile.in ---' `-> Makefile ---' ``` Note: remember to run autoheader sometimes (when?) -And when you do note (https://github.com/olofhagsand/cligen/issues/17) which states that cligen_custom.h should be in quote. +And when you do note (https://github.com/clicon/cligen/issues/17) which states that cligen_custom.h should be in quote. Get config.sub and config.guess: $ wget -O config.guess 'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD' diff --git a/doc/FAQ.md b/doc/FAQ.md index 2aaf2793..7872721b 100644 --- a/doc/FAQ.md +++ b/doc/FAQ.md @@ -65,7 +65,7 @@ Clixon also supports Yang extensions, see main example. ## Which programming language is used? Clixon is written in C. The plugins are written in C. The CLI -specification uses [CLIgen](http://github.com/olofhagsand/cligen) +specification uses [CLIgen](http://github.com/clicon/cligen) ## How to best understand Clixon? Run the Clixon main example, in the [example](../example) directory or [examples repo](https://github.com/clicon/clixon-examples), or [main documentation](https://clixon-docs.readthedocs.io) @@ -507,7 +507,7 @@ More are found in the doxygen reference. where 'cvv' contains the value of the variable 'var' and 'argv' contains the string "myarg". The 'cvv' datatype is a 'CLIgen variable vector'. -They are documented in [CLIgen tutorial](https://github.com/olofhagsand/cligen/blob/master/cligen_tutorial.pdf) +They are documented in [CLIgen tutorial](https://github.com/clicon/cligen/blob/master/cligen_tutorial.pdf) ## How do I write a validation function? Similar to a commit function, but instead write the transaction_validate() function. diff --git a/doc/INSTALL.md b/doc/INSTALL.md index 4afd8173..f353efa1 100644 --- a/doc/INSTALL.md +++ b/doc/INSTALL.md @@ -14,7 +14,7 @@ sudo apt-get install flex bison fcgi-dev curl-dev Install and build CLIgen ``` - git clone https://github.com/olofhagsand/cligen.git + git clone https://github.com/clicon/cligen.git cd cligen; configure; make; diff --git a/doc/README.md b/doc/README.md index 6dd18e12..36470a65 100644 --- a/doc/README.md +++ b/doc/README.md @@ -58,9 +58,9 @@ See [LICENSE.md](LICENSE.md) for the license. ## Dependencies Clixon depends on the following software packages, which need to exist on the target machine. -- [CLIgen](http://github.com/olofhagsand/cligen) If you need to build and install CLIgen: +- [CLIgen](http://github.com/clicon/cligen) If you need to build and install CLIgen: ``` - git clone https://github.com/olofhagsand/cligen.git + git clone https://github.com/clicon/cligen.git cd cligen; configure; make; make install ``` - Yacc/bison diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index 47ea47d3..af593366 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -43,7 +43,7 @@ RUN mkdir /clixon/build WORKDIR /clixon # Clone cligen -RUN git clone https://github.com/olofhagsand/cligen.git +RUN git clone https://github.com/clicon/cligen.git # Build cligen WORKDIR /clixon/cligen diff --git a/docker/main/Dockerfile b/docker/main/Dockerfile index d9ed4b81..6662f095 100644 --- a/docker/main/Dockerfile +++ b/docker/main/Dockerfile @@ -44,7 +44,7 @@ RUN mkdir /clixon/build WORKDIR /clixon # Clone cligen -RUN git clone https://github.com/olofhagsand/cligen.git +RUN git clone https://github.com/clicon/cligen.git # Build cligen WORKDIR /clixon/cligen diff --git a/test/cicd/cicd.sh b/test/cicd/cicd.sh index ec1821a1..0929e2e6 100755 --- a/test/cicd/cicd.sh +++ b/test/cicd/cicd.sh @@ -36,7 +36,7 @@ ssh -t $h "(cd /tmp; chmod 750 $SCRIPTS)" # pull git changes and build cligen ssh -t $h "test -d src || mkdir src" -ssh -t $h "test -d src/cligen || (cd src;git clone https://github.com/olofhagsand/cligen.git)" +ssh -t $h "test -d src/cligen || (cd src;git clone https://github.com/clicon/cligen.git)" ssh -t $h "(cd src/cligen;git pull)" ssh -t $h "(cd src/cligen;./configure)" ssh -t $h "(cd src/cligen; /tmp/cligen-mk.sh)" diff --git a/test/travis/before_script.sh b/test/travis/before_script.sh index 4f20b52e..99da8935 100755 --- a/test/travis/before_script.sh +++ b/test/travis/before_script.sh @@ -1,5 +1,5 @@ #!/bin/sh # Travis pre-config script. # Clone and install CLIgen (needed for clixon configure and make) -git clone https://github.com/olofhagsand/cligen.git +git clone https://github.com/clicon/cligen.git (cd cligen && ./configure && make && sudo make install) diff --git a/test/vagrant/vagrant.sh b/test/vagrant/vagrant.sh index c313c45f..fb7c7df8 100755 --- a/test/vagrant/vagrant.sh +++ b/test/vagrant/vagrant.sh @@ -155,7 +155,7 @@ fi # cligen test -d src || mkdir src -test -d src/cligen || (cd src;git clone https://github.com/olofhagsand/cligen.git) +test -d src/cligen || (cd src;git clone https://github.com/clicon/cligen.git) cd src/cligen git pull