diff --git a/README b/README index 5e06a079..abfb75e0 100644 --- a/README +++ b/README @@ -17,14 +17,16 @@ install locally, using the following instructions... 3) Configure: cd byobu* ./configure --prefix="$HOME/byobu" - 4) Build: + 4) OPTIONAL: Use python from your environment, rather than from your distro + sed -i -e "s:/usr/bin/python:/usr/bin/env python" usr/bin/* usr/lib/byobu/include/* + 5) Build: make - 5) Install: + 6) Install: make install - 6) Update your PATH and BYOBU_PREFIX environment variables + 7) Update your PATH and BYOBU_PREFIX environment variables echo "export PATH=$HOME/byobu/bin:$PATH" >> $HOME/.bashrc . $HOME/.bashrc - 7) Run: + 8) Run: byobu Note that you will need to have a few dependencies installed: diff --git a/debian/changelog b/debian/changelog index cfb54d41..e7943dc7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,17 @@ byobu (5.62) unreleased; urgency=low - LP: #1243017 - add a few environment variables to restore, including upstart to ensure upstart commands resume working in a session restart + * README, usr/bin/byobu-config, usr/bin/byobu-select-session, + usr/lib/byobu/include/ec2instancespricing.py: + - LP: #996559, LP: #988471, LP: #1237071 + - Okay, this is the last time I'm going back and forth on this; + for real ;-) + - In our 3 python scripts, we are going to use #!/usr/bin/python + + The vast majority of Byobu users are getting it from their + distro, and the package itself appropriately depends on python + - Advanced users, developers, and others who want to run a different + python in their environment will need to sed update three scripts + - I've left a hint in the README to that effect -- Dustin Kirkland Fri, 18 Oct 2013 16:29:56 -0500 diff --git a/usr/bin/byobu-config b/usr/bin/byobu-config index 02a5195f..6a3b8cc9 100755 --- a/usr/bin/byobu-config +++ b/usr/bin/byobu-config @@ -1,7 +1,9 @@ -#!/usr/bin/env python +#!/usr/bin/python # # byobu-config # Copyright (C) 2008 Canonical Ltd. +# Copyright (C) 2008-2013 Dustin Kirkland + # # Authors: Nick Barcet # Dustin Kirkland diff --git a/usr/bin/byobu-select-session b/usr/bin/byobu-select-session index c8c1ff2c..6a939ce4 100755 --- a/usr/bin/byobu-select-session +++ b/usr/bin/byobu-select-session @@ -1,8 +1,8 @@ -#!/usr/bin/env python +#!/usr/bin/python # # byobu-select-session # Copyright (C) 2010 Canonical Ltd. -# Copyright (C) 2012 Dustin Kirkland +# Copyright (C) 2012-2013 Dustin Kirkland # # Authors: Dustin Kirkland # Ryan C. Thompson diff --git a/usr/lib/byobu/include/ec2instancespricing.py b/usr/lib/byobu/include/ec2instancespricing.py index 25f2950d..8534846f 100755 --- a/usr/lib/byobu/include/ec2instancespricing.py +++ b/usr/lib/byobu/include/ec2instancespricing.py @@ -1,6 +1,7 @@ -#!/usr/bin/env python +#!/usr/bin/python # # Copyright (c) 2012 Eran Sandler (eran@sandler.co.il), http://eran.sandler.co.il, http://forecastcloudy.net +# Copyright (C) 2012-2013 Dustin Kirkland # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the