{"thread":{"id":"320","subject":"[PATCH] cogito - split out cg-X* to prefix/lib/cogito","startedAt":"2005-04-26T04:53:33Z","lastAt":"2005-04-26T21:44:07Z","messageCount":3,"participants":["Joshua T. Corbin","Petr Baudis","Chris Wright"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"1709","messageId":"200504260053.33506.jcorbin@wunjo.org","threadId":"320","inReplyTo":null,"subject":"[PATCH] cogito - split out cg-X* to prefix/lib/cogito","fromName":"Joshua T. Corbin","fromEmail":"jcorbin@wunjo.org","sentAt":"2005-04-26T04:53:33Z","receivedAt":"2005-04-26T04:53:33Z","isPatch":true,"sender":{"key":"jcorbin@wunjo.org","avatar":null},"body":"The following patch does the following:\n  * Change the Makefile to install all cg-X* to $(prefix)/lib/cogito\n  * Modify all cg-* to use this lib prefix.\n\nBasically the cg-* script looks at $0, if it appears to be in a prefix/bin \ndirectory that also has a prefix/lib/cogito directory, look for the cg-X* \nthere; otherwise things will work as in old.\n\nSigned-off-by: Joshua T. Corbin <jcorbin@wunjo.org>\n\nIndex: Makefile\n===================================================================\n--- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/Makefile  (mode:100644 \nsha1:4f01bbbbb3fd0e53e9ce968f167b6dae68fcfa92)\n+++ bb131a04832677b22959ffe47f68900b94accc0c/Makefile  (mode:100644 \nsha1:615ccd429dc7f90820442165c64b5d9c047bccbb)\n@@ -21,6 +21,7 @@\n prefix=$(HOME)\n \n bindir=$(prefix)/bin\n+libdir=$(prefix)/lib/cogito\n \n CC=gcc\n AR=ar\n@@ -33,11 +34,12 @@\n  diff-cache convert-cache http-pull rpush rpull rev-list git-mktag \\\n  diff-tree-helper\n \n-SCRIPT= commit-id tree-id parent-id cg-Xdiffdo cg-Xmergefile \\\n- cg-add cg-admin-lsobj cg-cancel cg-clone cg-commit cg-diff \\\n- cg-export cg-help cg-init cg-log cg-ls cg-merge cg-mkpatch \\\n- cg-patch cg-pull cg-branch-add cg-branch-ls cg-rm cg-seek cg-status \\\n- cg-tag cg-update cg-Xlib\n+SCRIPT= commit-id tree-id parent-id cg-add cg-admin-lsobj cg-cancel \\\n+ cg-clone cg-commit cg-diff cg-export cg-help cg-init cg-log cg-ls \\\n+ cg-merge cg-mkpatch cg-patch cg-pull cg-branch-add cg-branch-ls \\\n+ cg-rm cg-seek cg-status cg-tag cg-update\n+\n+SCRIPTLIB= cg-Xlib cg-Xdiffdo cg-Xmergefile\n \n COMMON= read-cache.o\n \n@@ -96,7 +98,9 @@\n \n install: $(PROG) $(SCRIPTS) $(SCRIPT) $(GEN_SCRIPT)\n \tinstall -m755 -d $(DESTDIR)$(bindir)\n+\tinstall -m755 -d $(DESTDIR)$(libdir)\n \tinstall $(PROG) $(SCRIPTS) $(SCRIPT) $(GEN_SCRIPT) $(DESTDIR)$(bindir)\n+\tinstall $(SCRIPTLIB) $(DESTDIR)$(libdir)\n \n clean:\n \trm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(GEN_SCRIPT) $(LIB_FILE)\nIndex: cg-Xdiffdo\n===================================================================\n--- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/cg-Xdiffdo  (mode:100755 \nsha1:e3907b39ea105acb2f2ac3659f16898604b72d09)\n+++ bb131a04832677b22959ffe47f68900b94accc0c/cg-Xdiffdo  (mode:100755 \nsha1:832fd2c2a09274b5279327e1c31b99afc04fa7f1)\n@@ -12,7 +12,16 @@\n #\n # Outputs a diff converting the first tree to the second one.\n \n-. cg-Xlib\n+if [ -z \"$COGITO_LIB\" ]; then\n+  COGITO_LIB=$(dirname $(dirname $0))/lib/cogito\n+  if [ -d $COGITO_LIB ]; then\n+    COGITO_LIB=$COGITO_LIB/\n+  else\n+    COGITO_LIB=\n+  fi\n+fi\n+\n+. ${COGITO_LIB}cg-Xlib\n \n \n id1=$1; shift\nIndex: cg-Xmergefile\n===================================================================\n--- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/cg-Xmergefile  (mode:100755 \nsha1:0109e0ff4572be5c8f123f9df573b56a42718a17)\n+++ bb131a04832677b22959ffe47f68900b94accc0c/cg-Xmergefile  (mode:100755 \nsha1:b074685a23b33e42ec29734984f586b18e5f30de)\n@@ -21,7 +21,16 @@\n # do any merges that migth change the tree layout\n #\n \n-. cg-Xlib\n+if [ -z \"$COGITO_LIB\" ]; then\n+  COGITO_LIB=$(dirname $(dirname $0))/lib/cogito\n+  if [ -d $COGITO_LIB ]; then\n+    COGITO_LIB=$COGITO_LIB/\n+  else\n+    COGITO_LIB=\n+  fi\n+fi\n+\n+. ${COGITO_LIB}cg-Xlib\n \n # if the directory is newly added in a branch, it might not exist\n # in the current tree\nIndex: cg-add\n===================================================================\n--- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/cg-add  (mode:100755 \nsha1:1b7a821fd0b3f9702508503a082869ed4ec3ab52)\n+++ bb131a04832677b22959ffe47f68900b94accc0c/cg-add  (mode:100755 \nsha1:034c164fefc6f61ab386f49b5d5bf63005ea0e77)\n@@ -8,7 +8,16 @@\n # Optional \"-n\" parameter specifies that you don't want to add directories\n # recursively.\n \n-. cg-Xlib\n+if [ -z \"$COGITO_LIB\" ]; then\n+  COGITO_LIB=$(dirname $(dirname $0))/lib/cogito\n+  if [ -d $COGITO_LIB ]; then\n+    COGITO_LIB=$COGITO_LIB/\n+  else\n+    COGITO_LIB=\n+  fi\n+fi\n+\n+. ${COGITO_LIB}cg-Xlib\n \n [ \"$1\" ] || die \"usage: cg-add [-n] FILE...\"\n \nIndex: cg-admin-lsobj\n===================================================================\n--- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/cg-admin-lsobj  (mode:100755 \nsha1:c68d9176d843700df17b109389102ae84eab3888)\n+++ bb131a04832677b22959ffe47f68900b94accc0c/cg-admin-lsobj  (mode:100755 \nsha1:95256f36dff108274cbdaff9c97eabc2976ae00e)\n@@ -16,7 +16,16 @@\n #\n # Takes the object type as the first parameter, defaults to all objects.\n \n-. cg-Xlib\n+if [ -z \"$COGITO_LIB\" ]; then\n+  COGITO_LIB=$(dirname $(dirname $0))/lib/cogito\n+  if [ -d $COGITO_LIB ]; then\n+    COGITO_LIB=$COGITO_LIB/\n+  else\n+    COGITO_LIB=\n+  fi\n+fi\n+\n+. ${COGITO_LIB}cg-Xlib\n \n target=$1\n \nIndex: cg-branch-add\n===================================================================\n--- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/cg-branch-add  (mode:100755 \nsha1:7ae72b5e920a7977641dfca8f02dda21a730b907)\n+++ bb131a04832677b22959ffe47f68900b94accc0c/cg-branch-add  (mode:100755 \nsha1:6b42c80b8102b42a0f391ca0b39746e6ef4fb167)\n@@ -26,7 +26,16 @@\n #\n # Takes the branch' name and location (local path or rsync URL).\n \n-. cg-Xlib\n+if [ -z \"$COGITO_LIB\" ]; then\n+  COGITO_LIB=$(dirname $(dirname $0))/lib/cogito\n+  if [ -d $COGITO_LIB ]; then\n+    COGITO_LIB=$COGITO_LIB/\n+  else\n+    COGITO_LIB=\n+  fi\n+fi\n+\n+. ${COGITO_LIB}cg-Xlib\n \n name=$1\n location=$2\nIndex: cg-branch-ls\n===================================================================\n--- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/cg-branch-ls  (mode:100755 \nsha1:20b0a30ce30f73020f9b02a5d606577182444186)\n+++ bb131a04832677b22959ffe47f68900b94accc0c/cg-branch-ls  (mode:100755 \nsha1:998505a87567a123e42fbd7dbc0233f524f6ed0c)\n@@ -5,7 +5,16 @@\n #\n # Takes no parameters.\n \n-. cg-Xlib\n+if [ -z \"$COGITO_LIB\" ]; then\n+  COGITO_LIB=$(dirname $(dirname $0))/lib/cogito\n+  if [ -d $COGITO_LIB ]; then\n+    COGITO_LIB=$COGITO_LIB/\n+  else\n+    COGITO_LIB=\n+  fi\n+fi\n+\n+. ${COGITO_LIB}cg-Xlib\n \n mkdir -p .git/branches\n [ \"$(find .git/branches -follow -type f)\" ] \\\nIndex: cg-cancel\n===================================================================\n--- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/cg-cancel  (mode:100755 \nsha1:0637536030d340f5e812868b40eb5d1b20612839)\n+++ bb131a04832677b22959ffe47f68900b94accc0c/cg-cancel  (mode:100755 \nsha1:19eaae5e9ac6490a5ded2a6ec52f68652b294d81)\n@@ -10,7 +10,16 @@\n #\n # Takes no arguments and the evil changes from the tree.\n \n-. cg-Xlib\n+if [ -z \"$COGITO_LIB\" ]; then\n+  COGITO_LIB=$(dirname $(dirname $0))/lib/cogito\n+  if [ -d $COGITO_LIB ]; then\n+    COGITO_LIB=$COGITO_LIB/\n+  else\n+    COGITO_LIB=\n+  fi\n+fi\n+\n+. ${COGITO_LIB}cg-Xlib\n \n # Undo seek?\n branch=\nIndex: cg-clone\n===================================================================\n--- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/cg-clone  (mode:100755 \nsha1:4ee0685c358e094c5350b3968d013105da6ddf7e)\n+++ bb131a04832677b22959ffe47f68900b94accc0c/cg-clone  (mode:100755 \nsha1:eacefb54e1b1893db819b169e4d9d8f442e8fbcf)\n@@ -8,7 +8,16 @@\n #\n # Takes an parameter specifying location of the source repository.\n \n-. cg-Xlib\n+if [ -z \"$COGITO_LIB\" ]; then\n+  COGITO_LIB=$(dirname $(dirname $0))/lib/cogito\n+  if [ -d $COGITO_LIB ]; then\n+    COGITO_LIB=$COGITO_LIB/\n+  else\n+    COGITO_LIB=\n+  fi\n+fi\n+\n+. ${COGITO_LIB}cg-Xlib\n \n location=$1\n [ \"$location\" ] || die \"usage: cg-clone SOURCE_LOC\"\nIndex: cg-commit\n===================================================================\n--- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/cg-commit  (mode:100755 \nsha1:053554d7a3e23ddcdab91a5e58e50286386092f2)\n+++ bb131a04832677b22959ffe47f68900b94accc0c/cg-commit  (mode:100755 \nsha1:3e521cd21bf104c746ff8a3f3248c2f898d1ac1d)\n@@ -10,7 +10,16 @@\n #\n # FIXME: Gets it wrong for filenames containing spaces.\n \n-. cg-Xlib\n+if [ -z \"$COGITO_LIB\" ]; then\n+  COGITO_LIB=$(dirname $(dirname $0))/lib/cogito\n+  if [ -d $COGITO_LIB ]; then\n+    COGITO_LIB=$COGITO_LIB/\n+  else\n+    COGITO_LIB=\n+  fi\n+fi\n+\n+. ${COGITO_LIB}cg-Xlib\n \n \n [ -s .git/blocked ] && die \"committing blocked: $(cat .git/blocked)\"\nIndex: cg-diff\n===================================================================\n--- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/cg-diff  (mode:100755 \nsha1:b0c3e7389c06718c789e40b9a4fdce0afcb17917)\n+++ bb131a04832677b22959ffe47f68900b94accc0c/cg-diff  (mode:100755 \nsha1:37b48a84bb140be9e61838f293f510d4be65b3b3)\n@@ -16,7 +16,16 @@\n #\n # Outputs a diff converting the first tree to the second one.\n \n-. cg-Xlib\n+if [ -z \"$COGITO_LIB\" ]; then\n+  COGITO_LIB=$(dirname $(dirname $0))/lib/cogito\n+  if [ -d $COGITO_LIB ]; then\n+    COGITO_LIB=$COGITO_LIB/\n+  else\n+    COGITO_LIB=\n+  fi\n+fi\n+\n+. ${COGITO_LIB}cg-Xlib\n \n \n id1=\" \"\n@@ -72,7 +81,7 @@\n \t# FIXME: Update ret based on what did we match. And take \"$@\"\n \t# to account after all.\n \tret=\n-\tdiff-cache -r -z $tree | xargs -0 cg-Xdiffdo \"$tree\" uncommitted \"$filter\"\n+\tdiff-cache -r -z $tree | xargs -0 ${COGITO_LIB}cg-Xdiffdo \"$tree\" \nuncommitted \"$filter\"\n \n \tif [ \"$id1\" != \" \" ]; then\n \t\trm $GIT_INDEX_FILE\n@@ -89,6 +98,6 @@\n \n [ \"$id1\" = \"$id2\" ] && die \"trying to diff $id1 against itself\"\n \n-diff-tree -r -z $id1 $id2 | xargs -0 cg-Xdiffdo $id1 $id2 \"$filter\"\n+diff-tree -r -z $id1 $id2 | xargs -0 ${COGITO_LIB}cg-Xdiffdo $id1 $id2 \n\"$filter\"\n \n [ \"$filter\" ] && rm $filter\nIndex: cg-export\n===================================================================\n--- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/cg-export  (mode:100755 \nsha1:d39eb8e723c8cb74c96b64d510f49d1bfcd7d5f8)\n+++ bb131a04832677b22959ffe47f68900b94accc0c/cg-export  (mode:100755 \nsha1:94d419de48a12f1ea1059451ac4cd489f7008916)\n@@ -6,7 +6,16 @@\n # Takes a target directory and optionally an id as a parameter,\n # defaulting to HEAD.\n \n-. cg-Xlib\n+if [ -z \"$COGITO_LIB\" ]; then\n+  COGITO_LIB=$(dirname $(dirname $0))/lib/cogito\n+  if [ -d $COGITO_LIB ]; then\n+    COGITO_LIB=$COGITO_LIB/\n+  else\n+    COGITO_LIB=\n+  fi\n+fi\n+\n+. ${COGITO_LIB}cg-Xlib\n \n destdir=$1\n id=$(tree-id $2)\nIndex: cg-help\n===================================================================\n--- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/cg-help  (mode:100755 \nsha1:36480174eba9cc54e9baba100cbd368fbced5c76)\n+++ bb131a04832677b22959ffe47f68900b94accc0c/cg-help  (mode:100755 \nsha1:9d059861d899862f736f91c07459569b57df34de)\n@@ -3,7 +3,16 @@\n # The help for the Cogito toolkit.\n # Copyright (c) Petr Baudis, 2005\n \n-. cg-Xlib\n+if [ -z \"$COGITO_LIB\" ]; then\n+  COGITO_LIB=$(dirname $(dirname $0))/lib/cogito\n+  if [ -d $COGITO_LIB ]; then\n+    COGITO_LIB=$COGITO_LIB/\n+  else\n+    COGITO_LIB=\n+  fi\n+fi\n+\n+. ${COGITO_LIB}cg-Xlib\n \n cat <<__END__\n The Cogito version control system  $(cg-version)\nIndex: cg-init\n===================================================================\n--- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/cg-init  (mode:100755 \nsha1:d249140002888742c46ecba5925cae7c8025ea93)\n+++ bb131a04832677b22959ffe47f68900b94accc0c/cg-init  (mode:100755 \nsha1:12d4716eb1b04f9d76a97e68ef6abd9f4ae62ef9)\n@@ -6,7 +6,16 @@\n # Takes an optional parameter which will make it \"clone\" a specified\n # remote repository.\n \n-. cg-Xlib\n+if [ -z \"$COGITO_LIB\" ]; then\n+  COGITO_LIB=$(dirname $(dirname $0))/lib/cogito\n+  if [ -d $COGITO_LIB ]; then\n+    COGITO_LIB=$COGITO_LIB/\n+  else\n+    COGITO_LIB=\n+  fi\n+fi\n+\n+. ${COGITO_LIB}cg-Xlib\n \n uri=$1\n \nIndex: cg-log\n===================================================================\n--- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/cg-log  (mode:100755 \nsha1:15016b6df35021af01ef8a564c47dbe2e08a78a2)\n+++ bb131a04832677b22959ffe47f68900b94accc0c/cg-log  (mode:100755 \nsha1:c7c4ecccb0844055c23a957a57385b787909883d)\n@@ -18,7 +18,16 @@\n # Takes an id resolving to a commit to start from (HEAD by default),\n # or id1:id2 representing an (id1;id2] range of commits to show.\n \n-. cg-Xlib\n+if [ -z \"$COGITO_LIB\" ]; then\n+  COGITO_LIB=$(dirname $(dirname $0))/lib/cogito\n+  if [ -d $COGITO_LIB ]; then\n+    COGITO_LIB=$COGITO_LIB/\n+  else\n+    COGITO_LIB=\n+  fi\n+fi\n+\n+. ${COGITO_LIB}cg-Xlib\n \n if [ \"$1\" = \"-c\" ]; then\n \tshift\nIndex: cg-ls\n===================================================================\n--- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/cg-ls  (mode:100755 \nsha1:5c9a90963252746e743b9295a47ffafc25ece848)\n+++ bb131a04832677b22959ffe47f68900b94accc0c/cg-ls  (mode:100755 \nsha1:a09eaeb6df0b082a4accfed7aaeec4654621708b)\n@@ -5,7 +5,16 @@\n #\n # Optionally takes commit or tree id as a parameter, defaulting to HEAD.\n \n-. cg-Xlib\n+if [ -z \"$COGITO_LIB\" ]; then\n+  COGITO_LIB=$(dirname $(dirname $0))/lib/cogito\n+  if [ -d $COGITO_LIB ]; then\n+    COGITO_LIB=$COGITO_LIB/\n+  else\n+    COGITO_LIB=\n+  fi\n+fi\n+\n+. ${COGITO_LIB}cg-Xlib\n \n id=$(tree-id $1) || exit 1\n \nIndex: cg-merge\n===================================================================\n--- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/cg-merge  (mode:100755 \nsha1:6f145b432be23419c82d5941e29b6bf082973f65)\n+++ bb131a04832677b22959ffe47f68900b94accc0c/cg-merge  (mode:100755 \nsha1:49c2a76243dc8f917107be619d205fe518946da9)\n@@ -13,7 +13,16 @@\n # Alternatively, it will just bring the HEAD forward, if your current\n # HEAD is also the merge base.\n \n-. cg-Xlib\n+if [ -z \"$COGITO_LIB\" ]; then\n+  COGITO_LIB=$(dirname $(dirname $0))/lib/cogito\n+  if [ -d $COGITO_LIB ]; then\n+    COGITO_LIB=$COGITO_LIB/\n+  else\n+    COGITO_LIB=\n+  fi\n+fi\n+\n+. ${COGITO_LIB}cg-Xlib\n \n head=$(commit-id)\n \n@@ -84,7 +93,7 @@\n \n \n read-tree -m $(tree-id $base) $(tree-id $head) $(tree-id $branch) || die \n\"read-tree failed\"\n-if ! merge-cache cg-Xmergefile -a || [ \"$careful\" ]; then\n+if ! merge-cache ${COGITO_LIB}cg-Xmergefile -a || [ \"$careful\" ]; then\n \tcheckout-cache -f -a\n \n \t# \"Resolve\" merges still in the cache (conflicts).\nIndex: cg-mkpatch\n===================================================================\n--- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/cg-mkpatch  (mode:100755 \nsha1:5ba423cbbb3e5f72cd7fb74f2873d49b60557f12)\n+++ bb131a04832677b22959ffe47f68900b94accc0c/cg-mkpatch  (mode:100755 \nsha1:ae47a32b6ff819177301f339735366fdcf1fd207)\n@@ -6,7 +6,16 @@\n # Takes commit ID, defaulting to HEAD, or id1:id2, forming a range\n # (id1;id2]. (Use \"id1:\" to take just everything from id1 to HEAD.)\n \n-. cg-Xlib\n+if [ -z \"$COGITO_LIB\" ]; then\n+  COGITO_LIB=$(dirname $(dirname $0))/lib/cogito\n+  if [ -d $COGITO_LIB ]; then\n+    COGITO_LIB=$COGITO_LIB/\n+  else\n+    COGITO_LIB=\n+  fi\n+fi\n+\n+. ${COGITO_LIB}cg-Xlib\n \n \n showpatch () {\nIndex: cg-patch\n===================================================================\n--- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/cg-patch  (mode:100755 \nsha1:779c5985b78bc055d5296407d23cc00f628c9d23)\n+++ bb131a04832677b22959ffe47f68900b94accc0c/cg-patch  (mode:100755 \nsha1:c2a57eadf8069c5cbec84979561bb2291f733f21)\n@@ -8,7 +8,16 @@\n #\n # Takes the diff on stdin.\n \n-. cg-Xlib\n+if [ -z \"$COGITO_LIB\" ]; then\n+  COGITO_LIB=$(dirname $(dirname $0))/lib/cogito\n+  if [ -d $COGITO_LIB ]; then\n+    COGITO_LIB=$COGITO_LIB/\n+  else\n+    COGITO_LIB=\n+  fi\n+fi\n+\n+. ${COGITO_LIB}cg-Xlib\n \n gonefile=$(mktemp -t gitapply.XXXXXX)\n todo=$(mktemp -t gitapply.XXXXXX)\nIndex: cg-pull\n===================================================================\n--- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/cg-pull  (mode:100755 \nsha1:5cd67519fc5399886f22e8758d6d34e0e3014cbb)\n+++ bb131a04832677b22959ffe47f68900b94accc0c/cg-pull  (mode:100755 \nsha1:e7a70ad7cb48ded1b28b9d2b137b4d50980bd0b7)\n@@ -7,7 +7,16 @@\n #\n # Takes the branch' name.\n \n-. cg-Xlib\n+if [ -z \"$COGITO_LIB\" ]; then\n+  COGITO_LIB=$(dirname $(dirname $0))/lib/cogito\n+  if [ -d $COGITO_LIB ]; then\n+    COGITO_LIB=$COGITO_LIB/\n+  else\n+    COGITO_LIB=\n+  fi\n+fi\n+\n+. ${COGITO_LIB}cg-Xlib\n \n name=$1\n \nIndex: cg-rm\n===================================================================\n--- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/cg-rm  (mode:100755 \nsha1:1e0c64567767668454a0360785ac84883c7bbd58)\n+++ bb131a04832677b22959ffe47f68900b94accc0c/cg-rm  (mode:100755 \nsha1:f2d2e0c042fdf9496d53e833a50d960331e145b4)\n@@ -8,7 +8,16 @@\n # Optional \"-n\" parameter specifies that you don't want to remove directories\n # recursively.\n \n-. cg-Xlib\n+if [ -z \"$COGITO_LIB\" ]; then\n+  COGITO_LIB=$(dirname $(dirname $0))/lib/cogito\n+  if [ -d $COGITO_LIB ]; then\n+    COGITO_LIB=$COGITO_LIB/\n+  else\n+    COGITO_LIB=\n+  fi\n+fi\n+\n+. ${COGITO_LIB}cg-Xlib\n \n [ \"$1\" ] || die \"usage: cg-rm [-n] FILE...\"\n \nIndex: cg-seek\n===================================================================\n--- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/cg-seek  (mode:100755 \nsha1:29224219fc08893a41e75412dca2ac576f93c30e)\n+++ bb131a04832677b22959ffe47f68900b94accc0c/cg-seek  (mode:100755 \nsha1:7537fcb6bfc00635cdd0d009a71e7786a7b367f7)\n@@ -20,7 +20,16 @@\n #\n # Takes the target commit ID.\n \n-. cg-Xlib\n+if [ -z \"$COGITO_LIB\" ]; then\n+  COGITO_LIB=$(dirname $(dirname $0))/lib/cogito\n+  if [ -d $COGITO_LIB ]; then\n+    COGITO_LIB=$COGITO_LIB/\n+  else\n+    COGITO_LIB=\n+  fi\n+fi\n+\n+. ${COGITO_LIB}cg-Xlib\n \n dstcommit=$1\n \nIndex: cg-status\n===================================================================\n--- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/cg-status  (mode:100755 \nsha1:c9b69b9d54b6a6756f0ecad5324642eb66810b33)\n+++ bb131a04832677b22959ffe47f68900b94accc0c/cg-status  (mode:100755 \nsha1:17bd538d9117b0b8bd7f7eaaaf1e2fd6552b9685)\n@@ -5,7 +5,16 @@\n #\n # Takes no arguments.\n \n-. cg-Xlib\n+if [ -z \"$COGITO_LIB\" ]; then\n+  COGITO_LIB=$(dirname $(dirname $0))/lib/cogito\n+  if [ -d $COGITO_LIB ]; then\n+    COGITO_LIB=$COGITO_LIB/\n+  else\n+    COGITO_LIB=\n+  fi\n+fi\n+\n+. ${COGITO_LIB}cg-Xlib\n \n {\n \tshow-files -z -t --others --deleted --unmerged\nIndex: cg-tag\n===================================================================\n--- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/cg-tag  (mode:100755 \nsha1:a48da6d3e584d78aab30ffb0a5e93b29986eb5a1)\n+++ bb131a04832677b22959ffe47f68900b94accc0c/cg-tag  (mode:100755 \nsha1:abc8dd69c1f9d0e023c2ed2d0b9982eb674f4f01)\n@@ -8,7 +8,16 @@\n #\n # Takes the tag's name and optionally the associated ID.\n \n-. cg-Xlib\n+if [ -z \"$COGITO_LIB\" ]; then\n+  COGITO_LIB=$(dirname $(dirname $0))/lib/cogito\n+  if [ -d $COGITO_LIB ]; then\n+    COGITO_LIB=$COGITO_LIB/\n+  else\n+    COGITO_LIB=\n+  fi\n+fi\n+\n+. ${COGITO_LIB}cg-Xlib\n \n name=$1\n id=$2\nIndex: cg-update\n===================================================================\n--- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/cg-update  (mode:100755 \nsha1:956b69db12df0e41d0ff01ade090ef87f7c3fa22)\n+++ bb131a04832677b22959ffe47f68900b94accc0c/cg-update  (mode:100755 \nsha1:292faa316195fe254552367f849c60403d0770da)\n@@ -6,7 +6,16 @@\n # Takes the branch' name; no parameter will cause it to update\n # against HEAD (only recovers lost files for now).\n \n-. cg-Xlib\n+if [ -z \"$COGITO_LIB\" ]; then\n+  COGITO_LIB=$(dirname $(dirname $0))/lib/cogito\n+  if [ -d $COGITO_LIB ]; then\n+    COGITO_LIB=$COGITO_LIB/\n+  else\n+    COGITO_LIB=\n+  fi\n+fi\n+\n+. ${COGITO_LIB}cg-Xlib\n \n name=$1\n \n"},{"id":"1785","messageId":"20050426202518.GK13224@pasky.ji.cz","threadId":"320","inReplyTo":"200504260053.33506.jcorbin@wunjo.org","subject":"Re: [PATCH] cogito - split out cg-X* to prefix/lib/cogito","fromName":"Petr Baudis","fromEmail":"pasky@ucw.cz","sentAt":"2005-04-26T20:25:19Z","receivedAt":"2005-04-26T20:25:19Z","isPatch":true,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Tue, Apr 26, 2005 at 06:53:33AM CEST, I got a letter\nwhere \"Joshua T. Corbin\" <jcorbin@wunjo.org> told me that...\n> The following patch does the following:\n>   * Change the Makefile to install all cg-X* to $(prefix)/lib/cogito\n>   * Modify all cg-* to use this lib prefix.\n> \n> Basically the cg-* script looks at $0, if it appears to be in a prefix/bin \n> directory that also has a prefix/lib/cogito directory, look for the cg-X* \n> there; otherwise things will work as in old.\n> \n> Signed-off-by: Joshua T. Corbin <jcorbin@wunjo.org>\n> \n> Index: cg-Xdiffdo\n> ===================================================================\n> --- ddd5e0ab084034b713bb2f7d9de6f365d5a2e5bf/cg-Xdiffdo  (mode:100755 \n> sha1:e3907b39ea105acb2f2ac3659f16898604b72d09)\n> +++ bb131a04832677b22959ffe47f68900b94accc0c/cg-Xdiffdo  (mode:100755 \n> sha1:832fd2c2a09274b5279327e1c31b99afc04fa7f1)\n> @@ -12,7 +12,16 @@\n>  #\n>  # Outputs a diff converting the first tree to the second one.\n>  \n> -. cg-Xlib\n> +if [ -z \"$COGITO_LIB\" ]; then\n> +  COGITO_LIB=$(dirname $(dirname $0))/lib/cogito\n> +  if [ -d $COGITO_LIB ]; then\n> +    COGITO_LIB=$COGITO_LIB/\n> +  else\n> +    COGITO_LIB=\n> +  fi\n> +fi\n> +\n> +. ${COGITO_LIB}cg-Xlib\n>  \n>  \n>  id1=$1; shift\n\nI think this is wrong, stuffing too much redundant logic to all those\nfiles. I'm fine with the last added line, but nothing more. What about\nrewriting the scripts during make install, doing something like\n\n\ts/\\${COGITO_LIB}/\\${COGITO_LIB:-$(libdir)}/\n\n?\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nC++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor\n"},{"id":"1808","messageId":"20050426214407.GC5324@shell0.pdx.osdl.net","threadId":"320","inReplyTo":"200504260053.33506.jcorbin@wunjo.org","subject":"Re: [PATCH] cogito - split out cg-X* to prefix/lib/cogito","fromName":"Chris Wright","fromEmail":"chrisw@osdl.org","sentAt":"2005-04-26T21:44:07Z","receivedAt":"2005-04-26T21:44:07Z","isPatch":true,"sender":{"key":"chrisw@sous-sol.org","avatar":null},"body":"(BTW, this patch was linewrapped)\n\n* Joshua T. Corbin (jcorbin@wunjo.org) wrote:\n> The following patch does the following:\n>   * Change the Makefile to install all cg-X* to $(prefix)/lib/cogito\n>   * Modify all cg-* to use this lib prefix.\n\nHmm, I agree with the intent of this patch (place extraneous bits out of\n/usr/bin namespace), although I'm not sure it's the best method.  It\nwinds up only putting three files there (with cg- prefixes as well).\n\nI've left it out of the rpm build for now.\n\nthanks,\n-chris\n-- \nLinux Security Modules     http://lsm.immunix.org     http://lsm.bkbits.net\n"}]}