more verbose upload/diff/merge
language preselection in config_form fixed tabindex in init_form fixed obsolte developer's links removed from nav.cs
This commit is contained in:
parent
85c00b3e8f
commit
e3f4cb49e3
5 changed files with 17 additions and 8 deletions
|
@ -169,9 +169,13 @@ function upload2devel()
|
|||
find "$TMP_DIR" -type d -name '\.svn' | while read a
|
||||
do rm -rf "$a"
|
||||
done
|
||||
scp -F "$SSH_CONFIG_FILE" -rpq "$TMP_DIR/." cryptobox:/tmp/mirror
|
||||
echo "Copying local files to the cryptobox ... "
|
||||
if scp -F "$SSH_CONFIG_FILE" -rpq "$TMP_DIR/." cryptobox:/tmp/mirror
|
||||
then echo "Set the base for future diffs to current state ..."
|
||||
ssh -F "$SSH_CONFIG_FILE" $SSH_HOST $REMOTE_COMMAND set_diff_base
|
||||
else echo 'ERROR: copying failed!'
|
||||
fi
|
||||
rm -rf "$TMP_DIR"
|
||||
ssh -F "$SSH_CONFIG_FILE" $SSH_HOST $REMOTE_COMMAND set_diff_base
|
||||
}
|
||||
|
||||
|
||||
|
@ -185,7 +189,8 @@ function merge_from_devel()
|
|||
then echo
|
||||
echo "Applying diff ..."
|
||||
ssh -F "$SSH_CONFIG_FILE" $SSH_HOST $REMOTE_COMMAND diff | patch -p1 -d "$TEMPLATE_DIR"
|
||||
# set the base for the next diff to present state
|
||||
echo
|
||||
echo "Set the base for future diffs to current state ..."
|
||||
ssh -F "$SSH_CONFIG_FILE" $SSH_HOST $REMOTE_COMMAND set_diff_base
|
||||
else echo "Merging will fail - do it manually!"
|
||||
fi
|
||||
|
|
|
@ -72,7 +72,7 @@ function config_set_value()
|
|||
# parameters: SettingName SettingValue
|
||||
{
|
||||
mount -o rw,remount "$CONFIG_DIR"
|
||||
echo "$2" > "$CONFIG_DIR/$1"
|
||||
echo -n "$2" > "$CONFIG_DIR/$1"
|
||||
mount -o ro,remount "$CONFIG_DIR"
|
||||
}
|
||||
|
||||
|
@ -88,7 +88,8 @@ function config_get_value()
|
|||
fi
|
||||
[ -z "$1" ] && error_msg 1 "empty setting name"
|
||||
[ ! -e "$conf_dir/$1" ] && error_msg 2 "unknown configuration value ($1)"
|
||||
cat "$conf_dir/$1"
|
||||
# remove trailing line break
|
||||
echo -n $(cat "$conf_dir/$1")
|
||||
}
|
||||
|
||||
|
||||
|
@ -126,7 +127,8 @@ function create_config()
|
|||
function get_current_ip()
|
||||
# not necessarily the same as configured (necessary for validation)
|
||||
{
|
||||
ifconfig $NET_IFACE | grep "inet" | cut -d ":" -f2 | cut -d " " -f1
|
||||
# filter the output of ifconfig and remove trailing line break
|
||||
echo -n $(ifconfig $NET_IFACE | grep "inet" | cut -d ":" -f2 | cut -d " " -f1)
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
<p><label for="language"><?cs var:Lang.Text.SelectLanguage ?></label><br/>
|
||||
<select name="language">
|
||||
<?cs each:item = Data.Languages ?>
|
||||
<option value="<?cs name:item ?>" <?cs if:(item == Data.Config.Language) ?>selected="selected"<?cs /if ?>><?cs var:item ?></option>
|
||||
<option value="<?cs name:item ?>" <?cs if:(name(item) == Data.Config.Language) ?>selected="selected"<?cs /if ?>><?cs var:item ?></option>
|
||||
<?cs /each ?>
|
||||
</select></p>
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
<p><label for="confirm"><?cs var:Lang.Text.ConfirmInitHint ?><br/>
|
||||
<span class="note" id="confirmtext"><?cs var:Lang.Text.ConfirmInit ?></span></label><br/>
|
||||
<input type="text" id="confirm" name="confirm" size="30" tabindex="3" maxlength="50" /></p>
|
||||
<button type="submit" name="action" value="init_do"><?cs var:Lang.Button.DoInit ?></button>
|
||||
<button type="submit" name="action" value="init_do" tabindex="4"><?cs var:Lang.Button.DoInit ?></button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
|
|
|
@ -18,6 +18,8 @@
|
|||
<a href="<?cs var:ScriptName ?>?action=shutdown_ask" title="Herunterfahren">Herunterfahren</a>
|
||||
|
||||
<?cs if:Data.Status.DevelopmentMode ?>
|
||||
<!-- no longer used
|
||||
<a href="/cgi-bin/validate.sh" title="Validation">Test-Sequenzen</a>
|
||||
<a href="/report/" title="Validierungsergebnisse">Test-Report</a>
|
||||
-->
|
||||
<?cs /if ?>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue