Changeset 185 for tags/confman-1.5.6a2
- Timestamp:
- 10/22/2007 17:19:50 (4 years ago)
- Location:
- tags/confman-1.5.6a2
- Files:
-
- 4 edited
-
Makefile (modified) (1 diff)
-
confman (modified) (21 diffs)
-
confmancommon.sh (modified) (1 diff)
-
confmanlib.sh (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
tags/confman-1.5.6a2/Makefile
r182 r185 8 8 BINFILES = abspath 9 9 SBINFILES = confman confaudit.sh 10 LIBEXECFILES = export.sh confsync.sh 10 LIBEXECFILES = export.sh confsync.sh confaudit.sh 11 11 LIBFILES = confmanlib.sh confmandoc.sh confmancommon.sh 12 12 ENVFILES = confman_completions -
tags/confman-1.5.6a2/confman
r174 r185 1 #! /bin/bash 1 #! /bin/bash 2 2 # 3 3 # confman provides a command-line interface to Rescomp's server configuration … … 40 40 if conf_wcopy_locked? 41 41 then 42 local lock_pid=`cat ${WORK_PATH}/confman.lock` #gets the PID of the confman instance that created the lock43 echo "Your working copy is locked by confman[$lock_pid]." >&242 echo "Your working copy is locked by confman[$WCOPY_LOCK_PID]." >&2 43 unset WCOPY_LOCK_PID 44 44 else 45 45 if [ -d ${WORK_PATH} ] … … 76 76 if conf_wcopy_locked? 77 77 then 78 local lock_pid=`cat ${WORK_PATH}/confman.lock`79 echo "Your working copy is locked by confman[$lock_pid]." >&278 echo "Your working copy is locked by confman[$WCOPY_LOCK_PID]." >&2 79 unset WCOPY_LOCK_PID 80 80 else 81 81 conf_lock_wcopy … … 95 95 if conf_wcopy_locked? 96 96 then 97 local lock_pid=`cat ${WORK_PATH}/confman.lock`98 echo "Your working copy is locked by confman[$lock_pid]." >&297 echo "Your working copy is locked by confman[$WCOPY_LOCK_PID]." >&2 98 unset WCOPY_LOCK_PID 99 99 else 100 100 conf_lock_wcopy … … 112 112 if conf_wcopy_locked? 113 113 then 114 local lock_pid=`cat ${WORK_PATH}/confman.lock`115 echo "Your working copy is locked by confman[$lock_pid]." >&2114 echo "Your working copy is locked by confman[$WCOPY_LOCK_PID]." >&2 115 unset WCOPY_LOCK_PID 116 116 else 117 117 conf_lock_wcopy … … 129 129 if conf_system_locked? && conf_wcopy_locked? 130 130 then 131 local wcopy_pid=`cat ${WORK_PATH}/confman.lock`132 local system_pid=`cat /var/run/confman.lock`133 echo "The system is locked by confman[$system_pid] and your working copy is locked by confman[$wcopy_pid]" >&2131 echo "The system is locked by confman[$SYSTEM_LOCK_PID] and your working copy is locked by confman[$WCOPY_LOCK_PID]" >&2 132 unset WCOPY_LOCK_PID 133 unset SYSTEM_LOCK_PID 134 134 elif conf_system_locked? 135 135 then 136 local lock_pid=`cat /var/run/confman.lock`137 echo "The system is locked by confman[$lock_pid]." >&2136 echo "The system is locked by confman[$SYSTEM_LOCK_PID]." >&2 137 unset SYSTEM_LOCK_PID 138 138 elif conf_wcopy_locked? 139 139 then 140 local lock_pid=`cat ${WORK_PATH}/confman.lock`141 echo "Your working copy is locked by confman[$lock_pid]." >&2140 echo "Your working copy is locked by confman[$WCOPY_LOCK_PID]." >&2 141 unset WCOPY_LOCK_PID 142 142 else 143 143 conf_lock_wcopy … … 180 180 if conf_system_locked? && conf_wcopy_locked? 181 181 then 182 local wcopy_pid=`cat ${WORK_PATH}/confman.lock`183 local system_pid=`cat /var/run/confman.lock`184 echo "The system is locked by confman[$system_pid] and your working copy is locked by confman[$wcopy_pid]" >&2182 echo "The system is locked by confman[$SYSTEM_LOCK_PID] and your working copy is locked by confman[$WCOPY_LOCK_PID]" >&2 183 unset WCOPY_LOCK_PID 184 unset SYSTEM_LOCK_PID 185 185 elif conf_system_locked? 186 186 then 187 local lock_pid=`cat /var/run/confman.lock`188 echo "The system is locked by confman[$lock_pid]." >&2187 echo "The system is locked by confman[$SYSTEM_LOCK_PID]." >&2 188 unset SYSTEM_LOCK_PID 189 189 elif conf_wcopy_locked? 190 190 then 191 local lock_pid=`cat ${WORK_PATH}/confman.lock`192 echo "Your working copy is locked by confman[$lock_pid]." >&2191 echo "Your working copy is locked by confman[$WCOPY_LOCK_PID]." >&2 192 unset WCOPY_LOCK_PID 193 193 else 194 194 conf_lock_wcopy … … 234 234 if conf_wcopy_locked? 235 235 then 236 local lock_pid=`cat ${WORK_PATH}/confman.lock` #gets the PID of the confman instance that created the lock 237 fi 238 if conf_wcopy_locked? && [ ! $lock_pid = $$ ] #checks to see if the wcopy is locked; if so, checks to see if the current instance created the lock 239 then 240 echo "Your working copy is locked by confman[$lock_pid]" >&2 241 else 236 echo "Your working copy is locked by confman[$WCOPY_LOCK_PID]." >&2 237 unset WCOPY_LOCK_PID 238 else 242 239 if conf_lock_wcopy 243 240 then … … 409 406 if conf_wcopy_locked? 410 407 then 411 local lock_pid=`cat ${WORK_PATH}/confman.lock`412 echo "Your working copy is locked by confman[$lock_pid]." >&2408 echo "Your working copy is locked by confman[$WCOPY_LOCK_PID]." >&2 409 unset WCOPY_LOCK_PID 413 410 else 414 411 conf_lock_wcopy … … 426 423 if conf_wcopy_locked? 427 424 then 428 local lock_pid=`cat ${WORK_PATH}/confman.lock`429 echo "Your working copy is locked by confman[$lock_pid]." >&2425 echo "Your working copy is locked by confman[$WCOPY_LOCK_PID]." >&2 426 unset WCOPY_LOCK_PID 430 427 else 431 428 conf_lock_wcopy … … 519 516 if conf_wcopy_locked? 520 517 then 521 local lock_pid=`cat ${WORK_PATH}/confman.lock` #gets the PID of the confman instance that created the lock 522 fi 523 if conf_wcopy_locked? && [ ! $lock_pid = $$ ] #checks to see if the wcopy is locked; if so, checks to see if the current instance created the lock 524 then 525 echo "Your working copy is locked by confman[$lock_pid]" >&2 526 else 518 echo "Your working copy is locked by confman[$WCOPY_LOCK_PID]." >&2 519 unset WCOPY_LOCK_PID 520 else 527 521 if conf_lock_wcopy 528 522 then … … 562 556 if conf_wcopy_locked? 563 557 then 564 local lock_pid=`cat ${WORK_PATH}/confman.lock` #gets the PID of the confman instance that created the lock 565 fi 566 if conf_wcopy_locked? && [ ! $lock_pid = $$ ] #checks to see if the wcopy is locked; if so, checks to see if the current instance created the lock 567 then 568 echo "Your working copy is locked by confman[$lock_pid]" >&2 569 else 558 echo "Your working copy is locked by confman[$WCOPY_LOCK_PID]." >&2 559 unset WCOPY_LOCK_PID 560 else 570 561 if conf_lock_wcopy 571 562 then … … 605 596 if conf_wcopy_locked? 606 597 then 607 local lock_pid=`cat ${WORK_PATH}/confman.lock` #gets the PID of the confman instance that created the lock 608 fi 609 if conf_wcopy_locked? && [ ! $lock_pid = $$ ] #checks to see if the wcopy is locked; if so, checks to see if the current instance created the lock 610 then 611 echo "Your working copy is locked by confman[$lock_pid]" >&2 612 else 598 echo "Your working copy is locked by confman[$WCOPY_LOCK_PID]." >&2 599 unset WCOPY_LOCK_PID 600 else 613 601 if conf_lock_wcopy 614 602 then … … 648 636 if conf_wcopy_locked? 649 637 then 650 local lock_pid=`cat ${WORK_PATH}/confman.lock`651 echo "Your working copy is locked by confman[$lock_pid]." >&2638 echo "Your working copy is locked by confman[$WCOPY_LOCK_PID]." >&2 639 unset WCOPY_LOCK_PID 652 640 else 653 641 conf_lock_wcopy … … 674 662 if conf_wcopy_locked? 675 663 then 676 local lock_pid=`cat ${WORK_PATH}/confman.lock`677 echo "Your working copy is locked by confman[$lock_pid]." >&2664 echo "Your working copy is locked by confman[$WCOPY_LOCK_PID]." >&2 665 unset WCOPY_LOCK_PID 678 666 else 679 667 conf_lock_wcopy … … 693 681 if conf_wcopy_locked? 694 682 then 695 local lock_pid=`cat ${WORK_PATH}/confman.lock`696 echo "Your working copy is locked by confman[$lock_pid]." >&2683 echo "Your working copy is locked by confman[$WCOPY_LOCK_PID]." >&2 684 unset WCOPY_LOCK_PID 697 685 else 698 686 conf_lock_wcopy … … 712 700 if conf_system_locked? && conf_wcopy_locked? 713 701 then 714 local wcopy_pid=`cat ${WORK_PATH}/confman.lock`715 local system_pid=`cat /var/run/confman.lock`716 echo "The system is locked by confman[$system_pid] and your working copy is locked by confman[$wcopy_pid]" >&2702 echo "The system is locked by confman[$SYSTEM_LOCK_PID] and your working copy is locked by confman[$WCOPY_LOCK_PID]" >&2 703 unset WCOPY_LOCK_PID 704 unset SYSTEM_LOCK_PID 717 705 elif conf_system_locked? 718 706 then 719 local lock_pid=`cat /var/run/confman.lock`720 echo "The system is locked by confman[$lock_pid]." >&2707 echo "The system is locked by confman[$SYSTEM_LOCK_PID]." >&2 708 unset SYSTEM_LOCK_PID 721 709 elif conf_wcopy_locked? 722 710 then 723 local lock_pid=`cat ${WORK_PATH}/confman.lock`724 echo "Your working copy is locked by confman[$lock_pid]." >&2711 echo "Your working copy is locked by confman[$WCOPY_LOCK_PID]." >&2 712 unset WCOPY_LOCK_PID 725 713 else 726 714 conf_lock_wcopy … … 754 742 if conf_wcopy_locked? 755 743 then 756 local lock_pid=`cat ${WORK_PATH}/confman.lock`757 echo "Your working copy is locked by confman[$lock_pid]." >&2744 echo "Your working copy is locked by confman[$WCOPY_LOCK_PID]." >&2 745 unset WCOPY_LOCK_PID 758 746 else 759 747 conf_lock_wcopy … … 771 759 if conf_wcopy_locked? 772 760 then 773 local lock_pid=`cat ${WORK_PATH}/confman.lock`774 echo "Your working copy is locked by confman[$lock_pid]." >&2761 echo "Your working copy is locked by confman[$WCOPY_LOCK_PID]." >&2 762 unset WCOPY_LOCK_PID 775 763 else 776 764 conf_lock_wcopy … … 805 793 if conf_wcopy_locked? 806 794 then 807 local lock_pid=`cat ${WORK_PATH}/confman.lock`808 echo "Your working copy is locked by confman[$lock_pid]." >&2795 echo "Your working copy is locked by confman[$WCOPY_LOCK_PID]." >&2 796 unset WCOPY_LOCK_PID 809 797 else 810 798 conf_lock_wcopy … … 824 812 if conf_wcopy_locked? 825 813 then 826 local lock_pid=`cat ${WORK_PATH}/confman.lock`827 echo "Your working copy is locked by confman[$lock_pid]." >&2814 echo "Your working copy is locked by confman[$WCOPY_LOCK_PID]." >&2 815 unset WCOPY_LOCK_PID 828 816 else 829 817 conf_lock_wcopy -
tags/confman-1.5.6a2/confmancommon.sh
r167 r185 16 16 UCONF="${HOME}/.confmanrc" 17 17 MYNAME=`basename $0` 18 18 if [ -z $MY_PID ] ; then 19 MY_PID="$$" 20 fi 19 21 # First things first. Check to see if the logging fd is open. If it's not, 20 22 # we re-spawn confman inside a pipe. -
tags/confman-1.5.6a2/confmanlib.sh
r173 r185 47 47 else 48 48 touch ${WORK_PATH}/confman.lock 49 echo $ $> "${WORK_PATH}/confman.lock" #Send PID to the lock to allow for recursive calls49 echo $MY_PID > "${WORK_PATH}/confman.lock" #Send PID to the lock to allow for recursive calls 50 50 return 0 51 51 fi … … 63 63 else 64 64 touch ${WORK_PATH}/confman.lock 65 echo $ $> "${WORK_PATH}/confman.lock" #Send PID to the lock to allow for recursive calls65 echo $MY_PID > "${WORK_PATH}/confman.lock" #Send PID to the lock to allow for recursive calls 66 66 return 0 67 67 fi … … 82 82 sudo touch /var/run/confman.lock 83 83 sudo chmod 666 /var/run/confman.lock 84 sudo echo $ $> "/var/run/confman.lock"85 return 184 sudo echo $MY_PID > "/var/run/confman.lock" 85 return 0 86 86 fi 87 87 } … … 95 95 96 96 function conf_wcopy_locked? { 97 if [ -f ${WORK_PATH}/confman.lock ] 98 then 97 if [ -f ${WORK_PATH}/confman.lock ] 98 then 99 WCOPY_LOCK_PID=`cat ${WORK_PATH}/confman.lock` #gets the PID of the confman instance that created the lock 100 else 101 return 1 102 fi 103 if [ $WCOPY_LOCK_PID = $MY_PID ] 104 then 105 return 1 106 else 99 107 return 0 100 else101 return 1102 108 fi 103 109 } … … 106 112 if [ -f /var/run/confman.lock ] 107 113 then 114 SYSTEM_LOCK_PID=`cat /var/run/confman.lock` #gets the PID of the confman instance that created the lock 115 else 116 return 1 117 fi 118 if [ $SYSTEM_LOCK_PID = $MY_PID ] 119 then 120 return 1 121 else 108 122 return 0 109 else110 return 1111 123 fi 112 124 } … … 417 429 local group=$3 418 430 local mode=$4 419 local workdir=" /"431 local workdir="" 420 432 local directories=`echo "$directory" | sed 's:/: :g'` 421 433 local dir
Note: See TracChangeset
for help on using the changeset viewer.
