Renato Botelho rbgarga
rbgarga
/ gist:2c6c1a234644df9ab2ec11306581b165
Created
May 4, 2018 14:07
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [?2004h[?1049h[?1h=[?2004h[1;73r[?12h[?12l[27m[29m[m[94m[H[2J[?25l[73;1H"src/etc/inc/util.inc" 2817L, 77943C[?2004l[?2004h[1;1H[92m[40m2415 [m[94m[1m[93m[40m▸ [m[94m[31m}[m[94m[70C[40m [m[94m | |
| [92m[40m2416 [m[94m[1m[93m[40m▸ [m[94m[32mreturn[m[94m [34mimplode[m[94m[31m([m[94m[36m','[m[94m, [32m$[m[94m[34mtextArray[m[94m[31m)[m[94m;[39C[40m [m[94m | |
| [92m[40m2417 [m[94m[31m}[m[94m[78C[40m [m[94m | |
| [92m[40m2418 [m[94m[79C[40m [m[94m | |
| [92m[40m2419 [m[94m[92m/* Try to change a static route, if it doesn't exist, add it */[m[94m[16C[40m [m[94m | |
| [92m[40m2420 [m[94m[91mfunction[m[94m route_add_or_change[31m([m[94m[32m$[m[94m[34margs[m[94m[31m)[m[94m [31m{[m[94m[42C[40m [m[94m | |
| [92m[40m2421 [m[94m[1m[93m[40m▸ [m[94m[33mglobal[m[94m [32m$[m[94m[34mconfig[m[94m;[56C[40m [m[94m | |
| [92m[40m2422 [m[94m[79C[40m [m[94m | |
| [92m[40m2423 [m[94m[1m[93m[40m▸ [m |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc | |
| index db8ec7375..4bcc329bc 100644 | |
| --- a/src/etc/inc/util.inc | |
| +++ b/src/etc/inc/util.inc | |
| @@ -2395,7 +2395,8 @@ function route_add_or_change($args) { | |
| } | |
| /* First, try to add it */ | |
| - $_gb = exec(escapeshellcmd("/sbin/route add " . $args), $output, $rc); | |
| + $_gb = exec(escapeshellcmd("/sbin/route add " . $args . " 2>&1"), |
rbgarga
/ git_resolve.sh
Created
January 6, 2017 13:58
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #!/bin/sh | |
| unset theirs ours | |
| while getopts to opt; do | |
| case ${opt} in | |
| t) | |
| theirs=1 | |
| ;; | |
| o) | |
| ours=1 |
rbgarga
/ git_resolve.sh
Created
January 6, 2017 13:35
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #!/bin/sh | |
| unset theirs ours | |
| while getopts to opt; do | |
| case ${opt} in | |
| t) | |
| theirs=1 | |
| ;; | |
| o) | |
| ours=1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/etc/rc.linkup b/src/etc/rc.linkup | |
| index 2078369..6179371 100755 | |
| --- a/src/etc/rc.linkup | |
| +++ b/src/etc/rc.linkup | |
| @@ -76,8 +76,18 @@ function handle_argument_group($iface, $argument2) { | |
| return; | |
| } | |
| - $ipaddr = $config['interfaces'][$iface]['ipaddr']; | |
| - $ip6addr = $config['interfaces'][$iface]['ipaddrv6']; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/etc/rc.linkup b/src/etc/rc.linkup | |
| index 2078369..af08387 100755 | |
| --- a/src/etc/rc.linkup | |
| +++ b/src/etc/rc.linkup | |
| @@ -76,8 +76,18 @@ function handle_argument_group($iface, $argument2) { | |
| return; | |
| } | |
| - $ipaddr = $config['interfaces'][$iface]['ipaddr']; | |
| - $ip6addr = $config['interfaces'][$iface]['ipaddrv6']; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/etc/rc.linkup b/src/etc/rc.linkup | |
| index 2078369..6f12531 100755 | |
| --- a/src/etc/rc.linkup | |
| +++ b/src/etc/rc.linkup | |
| @@ -76,8 +76,18 @@ function handle_argument_group($iface, $argument2) { | |
| return; | |
| } | |
| - $ipaddr = $config['interfaces'][$iface]['ipaddr']; | |
| - $ip6addr = $config['interfaces'][$iface]['ipaddrv6']; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/etc/rc.linkup b/src/etc/rc.linkup | |
| index 2078369..96618a4 100755 | |
| --- a/src/etc/rc.linkup | |
| +++ b/src/etc/rc.linkup | |
| @@ -76,8 +76,18 @@ function handle_argument_group($iface, $argument2) { | |
| return; | |
| } | |
| - $ipaddr = $config['interfaces'][$iface]['ipaddr']; | |
| - $ip6addr = $config['interfaces'][$iface]['ipaddrv6']; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #!/bin/sh | |
| # | |
| # git_checkout.sh | |
| # | |
| # Copyright (c) 2016 Electric Sheep Fencing, LLC. All rights reserved. | |
| # | |
| # Redistribution and use in source and binary forms, with or without | |
| # modification, are permitted provided that the following conditions are met: | |
| # | |
| # 1. Redistributions of source code must retain the above copyright notice, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/usr/local/www/status_dhcpv6_leases.php b/src/usr/local/www/status_dhcpv6_leases.php | |
| index 2392f48..d4e1933 100644 | |
| --- a/src/usr/local/www/status_dhcpv6_leases.php | |
| +++ b/src/usr/local/www/status_dhcpv6_leases.php | |
| @@ -180,14 +180,23 @@ function parse_duid($duid_string) { | |
| } | |
| $awk = "/usr/bin/awk"; | |
| +$sed = "/usr/bin/sed"; | |
| + |