diff options
Diffstat (limited to 'usr/src/tools/scripts')
| -rw-r--r-- | usr/src/tools/scripts/git-pbchk.1 | 4 | ||||
| -rw-r--r-- | usr/src/tools/scripts/ws.sh | 14 |
2 files changed, 7 insertions, 11 deletions
diff --git a/usr/src/tools/scripts/git-pbchk.1 b/usr/src/tools/scripts/git-pbchk.1 index 433c699329..8727d3ae5e 100644 --- a/usr/src/tools/scripts/git-pbchk.1 +++ b/usr/src/tools/scripts/git-pbchk.1 @@ -33,12 +33,8 @@ Check that putback comments follow the prescribed format (only run for pbchk) .TP Copyrights -<<<<<<< HEAD -Check that each source file contains a copyright notice for the current year\. You need to fix this if you, the potential new copyright holder, chooses not to -======= Check that each source file contains a copyright notice for the current year\. You don't need to fix this if you, the potential new copyright holder, chooses not to ->>>>>>> 8bcea97... 1960 developer tools should support git .TP C style diff --git a/usr/src/tools/scripts/ws.sh b/usr/src/tools/scripts/ws.sh index 76440bb552..7f9f36a7cc 100644 --- a/usr/src/tools/scripts/ws.sh +++ b/usr/src/tools/scripts/ws.sh @@ -82,8 +82,8 @@ check_proto() # check if it exists or not, we never did for Teamware, # since it might appear later anyway. # - if [[ "${proto##ssh://}" == "$proto" -a \ - "${proto##http://}" == "$proto" -a \ + if [[ "${proto##ssh://}" == "$proto" && \ + "${proto##http://}" == "$proto" && \ "${proto##https://}" == "$proto" ]]; then echo "${proto}/root_${MACH}" fi @@ -159,8 +159,8 @@ unset tmpwsname # # Checking for CODEMGR_WSPATH # -if [[ "(" "${CODEMGR_WSPATH}x" != "x" ")" -a "(" ! -d $wsname ")" -a \ - "(" `expr "$wsname" : "\/"` = "0" ")" ]] +if [[ -n ${CODEMGR_WSPATH} && ( ! -d $wsname ) && \ + ( `expr "$wsname" : "\/"` = "0" ) ]] then ofs=$IFS IFS=": " @@ -217,15 +217,15 @@ CODEMGR_WS=$wsname ; export CODEMGR_WS SRC=$wsname/usr/src; export SRC TSRC=$wsname/usr/ontest; export TSRC -if [[ "$SCM_MODE" = "teamware" -a -d ${wsname}/Codemgr_wsdata ]]; then +if [[ "$SCM_MODE" = "teamware" && -d ${wsname}/Codemgr_wsdata ]]; then CM_DATA="Codemgr_wsdata" wsosdir=$CODEMGR_WS/$CM_DATA/sunos protofile=$wsosdir/protodefs -elif [[ "$SCM_MODE" = "mercurial" -a -d ${wsname}/.hg ]]; then +elif [[ "$SCM_MODE" = "mercurial" && -d ${wsname}/.hg ]]; then CM_DATA=".hg" wsosdir=$CODEMGR_WS/$CM_DATA protofile=$wsosdir/org.opensolaris.protodefs -elif [[ "$SCM_MODE" = "git" -a -d ${wsname}/.git ]]; then +elif [[ "$SCM_MODE" = "git" && -d ${wsname}/.git ]]; then CM_DATA=".git" wsosdir=$CODEMGR_WS/$CM_DATA protofile=$wsosdir/org.opensolaris.protodefs |