Skip to content

Commit

Permalink
modified: conf/VERSIONID
Browse files Browse the repository at this point in the history
	modified:   scripts/bash/init/init.bash
  • Loading branch information
SDRausty committed Sep 29, 2019
1 parent 925c629 commit 85e0bff
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion conf/VERSIONID
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSIONID="v4.2.5"
VERSIONID="v4.2.6"
17 changes: 8 additions & 9 deletions scripts/bash/init/init.bash
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,18 @@ export SRDR="${RDR##*/}" # search: string manipulation site:www.tldp.org
export JDR="$RDR/sources/$JID"
cd "$RDR"
(git pull) || (printf "\\nCANNOT UPDATE ~/%s: Continuing...\\n\\n" "${RDR##*/}")
if [[ ! -d "scripts/bash/shlibs" ]] && [[ ! -f .gitmodules ]]
if [[ -f .gitmodules ]]
then
(git clone https://github.com/shlibs/shlibs.bash scripts/bash/shlibs) || (printf "\\nCANNOT CLONE MODULE: Continuing...\\n\\n")
if grep shlibs .gitmodules 1>/dev/null
then
(git submodule update --init --recursive --remote scripts/bash/shlibs) || (printf "\\nCANNOT UPDATE ~/%s/scripts/bash/shlibs: Continuing...\\n\\n" "${RDR##*/}")
fi
else
if [[ -f .gitmodules ]]
if [[ ! -d "scripts/bash/shlibs" ]]
then
(git submodule add https://github.com/shlibs/shlibs.bash scripts/bash/shlibs) || (printf "\\nCANNOT ADD MODULE: Continuing...\\n\\n")
if grep shlibs .gitmodules 1>/dev/null
then
(git submodule update --init --recursive --remote scripts/bash/shlibs) || (printf "\\nCANNOT UPDATE ~/%s/scripts/bash/shlibs: Continuing...\\n\\n" "${RDR##*/}")
fi
(git clone https://github.com/shlibs/shlibs.bash scripts/bash/shlibs) || (printf "\\nCANNOT CLONE MODULE: Continuing...\\n\\n")
else
(git submodule update --init --recursive --remote scripts/bash/shlibs) || (printf "\\nCANNOT UPDATE ~/%s/scripts/bash/shlibs: Continuing...\\n\\n" "${RDR##*/}")
(git submodule add https://github.com/shlibs/shlibs.bash scripts/bash/shlibs) || (printf "\\nCANNOT ADD MODULE: Continuing...\\n\\n")
fi
fi

Expand Down

0 comments on commit 85e0bff

Please sign in to comment.