holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Move resolution of SHORWEALL_DIR to the ci

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5087 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-12-10 20:21:02 +00:00
parent a0d2b57f7e
commit 8099739303
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/lib.config
View File

@ -1846,8 +1846,6 @@ do_initialize() {
;;
esac
[ -n "$SHOREWALL_DIR" ] && SHOREWALL_DIR=$(resolve_file $SHOREWALL_DIR)
ensure_config_path
VERSION_FILE=$SHAREDIR/version

16
Shorewall/shorewall
View File

@ -293,7 +293,7 @@ start_command() {
fi
fi
SHOREWALL_DIR=$1
SHOREWALL_DIR=$(resolve_file $1)
export SHOREWALL_DIR
;;
*)
@ -397,7 +397,7 @@ compile_command() {
fi
fi
SHOREWALL_DIR=$1
SHOREWALL_DIR=$(resolve_file $1)
export SHOREWALL_DIR
file=$2
;;
@ -462,7 +462,7 @@ check_command() {
fi
fi
SHOREWALL_DIR=$1
SHOREWALL_DIR=$(resolve_file $1)
export SHOREWALL_DIR
;;
*)
@ -526,7 +526,7 @@ restart_command() {
fi
fi
SHOREWALL_DIR=$1
SHOREWALL_DIR=$(resolve_file $1)
export SHOREWALL_DIR
;;
*)
@ -674,7 +674,7 @@ safe_commands() {
fi
fi
SHOREWALL_DIR=$1
SHOREWALL_DIR=$(resolve_file $1)
export SHOREWALL_DIR
;;
*)
@ -771,7 +771,7 @@ try_command() {
fi
fi
SHOREWALL_DIR=$1
SHOREWALL_DIR=$(resolve_file $1)
export SHOREWALL_DIR
}
@ -934,7 +934,7 @@ reload_command() # $* = original arguments less the command.
esac
if [ -z "$getcaps" ]; then
SHOREWALL_DIR=$directory
SHOREWALL_DIR=$(resolve_file $directory)
capabilities=$(find_file capabilities)
[ -f $capabilities ] || getcaps=Yes
fi
@ -1129,7 +1129,7 @@ while [ $finished -eq 0 ]; do
fi
fi
SHOREWALL_DIR=$2
SHOREWALL_DIR=$(resolve_file $2)
option=
shift
;;