github/byobu
1
0
Fork 0
mirror of https://github.com/dustinkirkland/byobu synced 2025-08-22 14:24:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

* usr/bin/byobu-janitor: LP: #899271

Browse source 
- sed -i -e changes symlinks to local files, avoid this with readlink
This commit is contained in:
Dustin Kirkland 2011-12-18 21:29:40 -06:00
commit a8e34f83b0
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
debian/changelog vendored
View file

@ -12,8 +12,9 @@ byobu (4.55) unreleased; urgency=low
until we have a better way of detecting it until we have a better way of detecting it
* usr/lib/byobu/menu: LP: #881993 * usr/lib/byobu/menu: LP: #881993
- fix escape key determination - fix escape key determination
* usr/bin/byobu-janitor: * usr/bin/byobu-janitor: LP: #899271
- clean up some old upgrade cruft - clean up some old upgrade cruft
- sed -i -e changes symlinks to local files, avoid this with readlink
[ Will Ellwood ] [ Will Ellwood ]
* usr/lib/byobu/disk: LP: #904824 * usr/lib/byobu/disk: LP: #904824

6
usr/bin/byobu-janitor
View file

@ -76,7 +76,7 @@ for f in status statusrc; do
cp -f "$BYOBU_PREFIX/share/$PKG/status/$f" "$BYOBU_CONFIG_DIR/$f" cp -f "$BYOBU_PREFIX/share/$PKG/status/$f" "$BYOBU_CONFIG_DIR/$f"
# Enable ec2_cost, if we're in ec2 and seeding a new setup # Enable ec2_cost, if we're in ec2 and seeding a new setup
if metadata_available; then if metadata_available; then
$SED -i -e "s/#ec2_cost/ec2_cost/g" "$BYOBU_CONFIG_DIR/$f" $SED -i -e "s/#ec2_cost/ec2_cost/g" "$($READLINK -f $BYOBU_CONFIG_DIR/$f)"
fi fi
fi fi
done done
@ -90,7 +90,7 @@ fi
# Affects: Upgrades from <= byobu-2.78 which might have "motd+shell" # Affects: Upgrades from <= byobu-2.78 which might have "motd+shell"
# in their window list; update this to just "shell" # in their window list; update this to just "shell"
if grep -qs "motd+shell" "$BYOBU_CONFIG_DIR/windows"; then if grep -qs "motd+shell" "$BYOBU_CONFIG_DIR/windows"; then
$SED -i -e "s/motd+shell/shell/g" "$BYOBU_CONFIG_DIR/windows" || true $SED -i -e "s/motd+shell/shell/g" "$($READLINK -f $BYOBU_CONFIG_DIR/windows)" || true
fi fi
# Affects: Upgrades from <= byobu 4.3, remove ec2_rates # Affects: Upgrades from <= byobu 4.3, remove ec2_rates
@ -98,7 +98,7 @@ rm -f "$BYOBU_CONFIG_DIR/ec2_rates"
# Affects: Upgrades from <= byobu 4.4, update "shell" -> "byobu-shell" # Affects: Upgrades from <= byobu 4.4, update "shell" -> "byobu-shell"
if grep -qs " shell$" "$BYOBU_CONFIG_DIR/windows"; then if grep -qs " shell$" "$BYOBU_CONFIG_DIR/windows"; then
$SED -i -e "s/ shell$/ $PKG-shell/g" "$BYOBU_CONFIG_DIR/windows" || true $SED -i -e "s/ shell$/ $PKG-shell/g" "$($READLINK -f $BYOBU_CONFIG_DIR/windows)" || true
fi fi
# Affects: Upgrades from <= byobu 4.22 # Affects: Upgrades from <= byobu 4.22