Author: biurrun Date: Tue Mar 16 17:31:34 2010 New Revision: 2147 Log: Rename pisa_scripts.conf --> common_vars.conf. Added: trunk/tools/common_vars.conf - copied unchanged from r2146, trunk/tools/pisa_scripts.conf Deleted: trunk/tools/pisa_scripts.conf Modified: trunk/tools/auto-handover.sh trunk/tools/autoupdater.sh trunk/tools/create-screenrc.sh trunk/tools/trigger-demo-update.sh trunk/tools/trigger-hipupdate.sh Modified: trunk/tools/auto-handover.sh ============================================================================== --- trunk/tools/auto-handover.sh Tue Mar 16 12:08:08 2010 (r2146) +++ trunk/tools/auto-handover.sh Tue Mar 16 17:31:34 2010 (r2147) @@ -3,12 +3,12 @@ echo "This file searches APs with SSID $PATTERN* and switches to the strongest signal" # read config file -if [ ! -e "pisa_scripts.conf" ]; then - echo "ERROR: "$PWD"/pisa_scripts.conf not found!" +if [ ! -e "common_vars.conf" ]; then + echo "ERROR: "$PWD"/common_vars.conf not found!" exit 1 fi -. pisa_scripts.conf +. common_vars.conf ## internal parameters Modified: trunk/tools/autoupdater.sh ============================================================================== --- trunk/tools/autoupdater.sh Tue Mar 16 12:08:08 2010 (r2146) +++ trunk/tools/autoupdater.sh Tue Mar 16 17:31:34 2010 (r2147) @@ -8,12 +8,12 @@ #### CONFIG #### # read config file -if [ ! -e "$PWD/pisa_scripts.conf" ]; then - echo "ERROR: "$PWD"/pisa_scripts.conf not found!" +if [ ! -e "$PWD/common_vars.conf" ]; then + echo "ERROR: "$PWD"/common_vars.conf not found!" exit 1 fi -. $PWD"/pisa_scripts.conf" +. $PWD"/common_vars.conf" # we need the fully qualified path REMOTE_HIPL_DIR=$REMOTE_DIR"hipl--midauth2--2.6/" @@ -26,7 +26,7 @@ PISA_FILES=$PISA_FILES" tools/iwlist_parser tools/auto-handover.sh" PISA_FILES=$PISA_FILES" tools/create-screenrc.sh tools/autoupdater.sh" # These files might need modifications for your scenario -CUSTOM_FILES="pisa_scripts.conf pisacd.conf switch-ip" +CUSTOM_FILES="common_vars.conf pisacd.conf switch-ip" #### DON'T CHANGE BELOW #### Modified: trunk/tools/create-screenrc.sh ============================================================================== --- trunk/tools/create-screenrc.sh Tue Mar 16 12:08:08 2010 (r2146) +++ trunk/tools/create-screenrc.sh Tue Mar 16 17:31:34 2010 (r2147) @@ -1,11 +1,11 @@ #!/bin/sh -if [ ! -e "$PWD/pisa_scripts.conf" ]; then - echo "ERROR: "$PWD"/pisa_scripts.conf not found!" +if [ ! -e "$PWD/common_vars.conf" ]; then + echo "ERROR: "$PWD"/common_vars.conf not found!" exit 1 fi -. $PWD"/pisa_scripts.conf" +. $PWD"/common_vars.conf" ### Content creation of screenrc starts here ### Modified: trunk/tools/trigger-demo-update.sh ============================================================================== --- trunk/tools/trigger-demo-update.sh Tue Mar 16 12:08:08 2010 (r2146) +++ trunk/tools/trigger-demo-update.sh Tue Mar 16 17:31:34 2010 (r2147) @@ -4,12 +4,12 @@ # It is supposed to be used in combination with pisabeacon # read config file -if [ ! -e "$PWD/pisa_scripts.conf" ]; then - echo "ERROR: "$PWD"/pisa_scripts.conf not found!" +if [ ! -e "$PWD/common_vars.conf" ]; then + echo "ERROR: "$PWD"/common_vars.conf not found!" exit 1 fi -. $PWD"/pisa_scripts.conf" +. $PWD"/common_vars.conf" # check for curl if which curl > /dev/null; then Modified: trunk/tools/trigger-hipupdate.sh ============================================================================== --- trunk/tools/trigger-hipupdate.sh Tue Mar 16 12:08:08 2010 (r2146) +++ trunk/tools/trigger-hipupdate.sh Tue Mar 16 17:31:34 2010 (r2147) @@ -1,12 +1,12 @@ #!/bin/sh # read config file -if [ ! -e "pisa_scripts.conf" ]; then - echo "ERROR: "$PWD"/pisa_scripts.conf not found!" +if [ ! -e "common_vars.conf" ]; then + echo "ERROR: "$PWD"/common_vars.conf not found!" exit 1 fi -. pisa_scripts.conf +. common_vars.conf # outputs the geo-id, if used in combination with pisabeacon if [ $# -eq 1 ]; then