From 7e626c0ed84dfb4f1c1ef46d190aa8a3b96853c7 Mon Sep 17 00:00:00 2001 From: Ivan Mahonin Date: Jun 15 2017 14:07:25 +0000 Subject: Merge branch 'master' of https://gitlab.com/blackwarthog/builder --- diff --git a/docker-builder-data/build/script/include/inc-pkall-git.sh b/docker-builder-data/build/script/include/inc-pkall-git.sh index b09b459..d94eb2c 100644 --- a/docker-builder-data/build/script/include/inc-pkall-git.sh +++ b/docker-builder-data/build/script/include/inc-pkall-git.sh @@ -6,7 +6,7 @@ # PK_CFLAGS # PK_CPPFLAGS # PK_CONFIGURE_OPTIONS_DEFAULT -# PK_GIT_OPTIONS +# PK_GIT_CHECKOUT source $INCLUDE_SCRIPT_DIR/inc-pkallunpack-git.sh source $INCLUDE_SCRIPT_DIR/inc-pkallinstall-default.sh diff --git a/docker-builder-data/build/script/include/inc-pkallunpack-git.sh b/docker-builder-data/build/script/include/inc-pkallunpack-git.sh index e81052a..6f53c1b 100644 --- a/docker-builder-data/build/script/include/inc-pkallunpack-git.sh +++ b/docker-builder-data/build/script/include/inc-pkallunpack-git.sh @@ -2,7 +2,7 @@ # PK_URL # PK_VERSION # PK_DIRNAME -# PK_GIT_OPTIONS +# PK_GIT_CHECKOUT source $INCLUDE_SCRIPT_DIR/inc-pkdownload-git.sh source $INCLUDE_SCRIPT_DIR/inc-pkunpack-git.sh diff --git a/docker-builder-data/build/script/include/inc-pkdownload-git.sh b/docker-builder-data/build/script/include/inc-pkdownload-git.sh index a382f34..8f00edb 100644 --- a/docker-builder-data/build/script/include/inc-pkdownload-git.sh +++ b/docker-builder-data/build/script/include/inc-pkdownload-git.sh @@ -1,7 +1,7 @@ # PK_URL # PK_DIRNAME -# PK_GIT_OPTIONS +# PK_GIT_CHECKOUT pkdownload() { if [ -d "$DOWNLOAD_PACKET_DIR/$PK_DIRNAME/.git" ]; then