Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Removes a bunch of deprecated files

git-svn-id: svn://cherokee-project.com/cherokee/trunk@6005 5dc97367-97f1-0310-9951-d761b3857238
  • Loading branch information...
commit 81a5bf77ccc3321a37fa1807a7508cede09ad79c 1 parent 32481fb
Alvaro Lopez Ortega alobbs authored
24 packages/osx/Cherokee-admin.app/Contents/Info.plist
View
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleExecutable</key>
- <string>run</string>
- <key>CFBundleName</key>
- <string>Cherokee Admin</string>
- <key>CFBundleIconFile</key>
- <string>cherokee_icon</string>
- <key>CFBundleIdentifier</key>
- <string>org.cherokee.webserver-admin</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>NSMainNibFile</key>
- <string>MainMenu</string>
- <key>NSPrincipalClass</key>
- <string>NSApplication</string>
- <key>CFBundleSignature</key>
- <string>????</string>
-</dict>
-</plist>
3  packages/osx/Cherokee-admin.app/Contents/MacOS/run
View
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/usr/local/bin/cherokee-admin-launcher
1  packages/osx/Cherokee-admin.app/Contents/PkgInfo
View
@@ -1 +0,0 @@
-APPL????
BIN  packages/osx/Cherokee-admin.app/Contents/Resources/cherokee_icon.icns
View
Binary file not shown
346 packages/osx/License.rtf
View
@@ -1,346 +0,0 @@
-{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf420
-{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\margl1440\margr1440\vieww11700\viewh13280\viewkind0
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural
-
-\f0\fs24 \cf0 GNU GENERAL PUBLIC LICENSE\
- Version 2, June 1991\
-\
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,\
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\
- Everyone is permitted to copy and distribute verbatim copies\
- of this license document, but changing it is not allowed.\
-\
- Preamble\
-\
- The licenses for most software are designed to take away your\
-freedom to share and change it. By contrast, the GNU General Public\
-License is intended to guarantee your freedom to share and change free\
-software--to make sure the software is free for all its users. This\
-General Public License applies to most of the Free Software\
-Foundation's software and to any other program whose authors commit to\
-using it. (Some other Free Software Foundation software is covered by\
-the GNU Lesser General Public License instead.) You can apply it to\
-your programs, too.\
-\
- When we speak of free software, we are referring to freedom, not\
-price. Our General Public Licenses are designed to make sure that you\
-have the freedom to distribute copies of free software (and charge for\
-this service if you wish), that you receive source code or can get it\
-if you want it, that you can change the software or use pieces of it\
-in new free programs; and that you know you can do these things.\
-\
- To protect your rights, we need to make restrictions that forbid\
-anyone to deny you these rights or to ask you to surrender the rights.\
-These restrictions translate to certain responsibilities for you if you\
-distribute copies of the software, or if you modify it.\
-\
- For example, if you distribute copies of such a program, whether\
-gratis or for a fee, you must give the recipients all the rights that\
-you have. You must make sure that they, too, receive or can get the\
-source code. And you must show them these terms so they know their\
-rights.\
-\
- We protect your rights with two steps: (1) copyright the software, and\
-(2) offer you this license which gives you legal permission to copy,\
-distribute and/or modify the software.\
-\
- Also, for each author's protection and ours, we want to make certain\
-that everyone understands that there is no warranty for this free\
-software. If the software is modified by someone else and passed on, we\
-want its recipients to know that what they have is not the original, so\
-that any problems introduced by others will not reflect on the original\
-authors' reputations.\
-\
- Finally, any free program is threatened constantly by software\
-patents. We wish to avoid the danger that redistributors of a free\
-program will individually obtain patent licenses, in effect making the\
-program proprietary. To prevent this, we have made it clear that any\
-patent must be licensed for everyone's free use or not licensed at all.\
-\
- The precise terms and conditions for copying, distribution and\
-modification follow.\
-\
- GNU GENERAL PUBLIC LICENSE\
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\
-\
- 0. This License applies to any program or other work which contains\
-a notice placed by the copyright holder saying it may be distributed\
-under the terms of this General Public License. The "Program", below,\
-refers to any such program or work, and a "work based on the Program"\
-means either the Program or any derivative work under copyright law:\
-that is to say, a work containing the Program or a portion of it,\
-either verbatim or with modifications and/or translated into another\
-language. (Hereinafter, translation is included without limitation in\
-the term "modification".) Each licensee is addressed as "you".\
-\
-Activities other than copying, distribution and modification are not\
-covered by this License; they are outside its scope. The act of\
-running the Program is not restricted, and the output from the Program\
-is covered only if its contents constitute a work based on the\
-Program (independent of having been made by running the Program).\
-Whether that is true depends on what the Program does.\
-\
- 1. You may copy and distribute verbatim copies of the Program's\
-source code as you receive it, in any medium, provided that you\
-conspicuously and appropriately publish on each copy an appropriate\
-copyright notice and disclaimer of warranty; keep intact all the\
-notices that refer to this License and to the absence of any warranty;\
-and give any other recipients of the Program a copy of this License\
-along with the Program.\
-\
-You may charge a fee for the physical act of transferring a copy, and\
-you may at your option offer warranty protection in exchange for a fee.\
-\
- 2. You may modify your copy or copies of the Program or any portion\
-of it, thus forming a work based on the Program, and copy and\
-distribute such modifications or work under the terms of Section 1\
-above, provided that you also meet all of these conditions:\
-\
- a) You must cause the modified files to carry prominent notices\
- stating that you changed the files and the date of any change.\
-\
- b) You must cause any work that you distribute or publish, that in\
- whole or in part contains or is derived from the Program or any\
- part thereof, to be licensed as a whole at no charge to all third\
- parties under the terms of this License.\
-\
- c) If the modified program normally reads commands interactively\
- when run, you must cause it, when started running for such\
- interactive use in the most ordinary way, to print or display an\
- announcement including an appropriate copyright notice and a\
- notice that there is no warranty (or else, saying that you provide\
- a warranty) and that users may redistribute the program under\
- these conditions, and telling the user how to view a copy of this\
- License. (Exception: if the Program itself is interactive but\
- does not normally print such an announcement, your work based on\
- the Program is not required to print an announcement.)\
-\
-These requirements apply to the modified work as a whole. If\
-identifiable sections of that work are not derived from the Program,\
-and can be reasonably considered independent and separate works in\
-themselves, then this License, and its terms, do not apply to those\
-sections when you distribute them as separate works. But when you\
-distribute the same sections as part of a whole which is a work based\
-on the Program, the distribution of the whole must be on the terms of\
-this License, whose permissions for other licensees extend to the\
-entire whole, and thus to each and every part regardless of who wrote it.\
-\
-Thus, it is not the intent of this section to claim rights or contest\
-your rights to work written entirely by you; rather, the intent is to\
-exercise the right to control the distribution of derivative or\
-collective works based on the Program.\
-\
-In addition, mere aggregation of another work not based on the Program\
-with the Program (or with a work based on the Program) on a volume of\
-a storage or distribution medium does not bring the other work under\
-the scope of this License.\
-\
- 3. You may copy and distribute the Program (or a work based on it,\
-under Section 2) in object code or executable form under the terms of\
-Sections 1 and 2 above provided that you also do one of the following:\
-\
- a) Accompany it with the complete corresponding machine-readable\
- source code, which must be distributed under the terms of Sections\
- 1 and 2 above on a medium customarily used for software interchange; or,\
-\
- b) Accompany it with a written offer, valid for at least three\
- years, to give any third party, for a charge no more than your\
- cost of physically performing source distribution, a complete\
- machine-readable copy of the corresponding source code, to be\
- distributed under the terms of Sections 1 and 2 above on a medium\
- customarily used for software interchange; or,\
-\
- c) Accompany it with the information you received as to the offer\
- to distribute corresponding source code. (This alternative is\
- allowed only for noncommercial distribution and only if you\
- received the program in object code or executable form with such\
- an offer, in accord with Subsection b above.)\
-\
-The source code for a work means the preferred form of the work for\
-making modifications to it. For an executable work, complete source\
-code means all the source code for all modules it contains, plus any\
-associated interface definition files, plus the scripts used to\
-control compilation and installation of the executable. However, as a\
-special exception, the source code distributed need not include\
-anything that is normally distributed (in either source or binary\
-form) with the major components (compiler, kernel, and so on) of the\
-operating system on which the executable runs, unless that component\
-itself accompanies the executable.\
-\
-If distribution of executable or object code is made by offering\
-access to copy from a designated place, then offering equivalent\
-access to copy the source code from the same place counts as\
-distribution of the source code, even though third parties are not\
-compelled to copy the source along with the object code.\
-\
- 4. You may not copy, modify, sublicense, or distribute the Program\
-except as expressly provided under this License. Any attempt\
-otherwise to copy, modify, sublicense or distribute the Program is\
-void, and will automatically terminate your rights under this License.\
-However, parties who have received copies, or rights, from you under\
-this License will not have their licenses terminated so long as such\
-parties remain in full compliance.\
-\
- 5. You are not required to accept this License, since you have not\
-signed it. However, nothing else grants you permission to modify or\
-distribute the Program or its derivative works. These actions are\
-prohibited by law if you do not accept this License. Therefore, by\
-modifying or distributing the Program (or any work based on the\
-Program), you indicate your acceptance of this License to do so, and\
-all its terms and conditions for copying, distributing or modifying\
-the Program or works based on it.\
-\
- 6. Each time you redistribute the Program (or any work based on the\
-Program), the recipient automatically receives a license from the\
-original licensor to copy, distribute or modify the Program subject to\
-these terms and conditions. You may not impose any further\
-restrictions on the recipients' exercise of the rights granted herein.\
-You are not responsible for enforcing compliance by third parties to\
-this License.\
-\
- 7. If, as a consequence of a court judgment or allegation of patent\
-infringement or for any other reason (not limited to patent issues),\
-conditions are imposed on you (whether by court order, agreement or\
-otherwise) that contradict the conditions of this License, they do not\
-excuse you from the conditions of this License. If you cannot\
-distribute so as to satisfy simultaneously your obligations under this\
-License and any other pertinent obligations, then as a consequence you\
-may not distribute the Program at all. For example, if a patent\
-license would not permit royalty-free redistribution of the Program by\
-all those who receive copies directly or indirectly through you, then\
-the only way you could satisfy both it and this License would be to\
-refrain entirely from distribution of the Program.\
-\
-If any portion of this section is held invalid or unenforceable under\
-any particular circumstance, the balance of the section is intended to\
-apply and the section as a whole is intended to apply in other\
-circumstances.\
-\
-It is not the purpose of this section to induce you to infringe any\
-patents or other property right claims or to contest validity of any\
-such claims; this section has the sole purpose of protecting the\
-integrity of the free software distribution system, which is\
-implemented by public license practices. Many people have made\
-generous contributions to the wide range of software distributed\
-through that system in reliance on consistent application of that\
-system; it is up to the author/donor to decide if he or she is willing\
-to distribute software through any other system and a licensee cannot\
-impose that choice.\
-\
-This section is intended to make thoroughly clear what is believed to\
-be a consequence of the rest of this License.\
-\
- 8. If the distribution and/or use of the Program is restricted in\
-certain countries either by patents or by copyrighted interfaces, the\
-original copyright holder who places the Program under this License\
-may add an explicit geographical distribution limitation excluding\
-those countries, so that distribution is permitted only in or among\
-countries not thus excluded. In such case, this License incorporates\
-the limitation as if written in the body of this License.\
-\
- 9. The Free Software Foundation may publish revised and/or new versions\
-of the General Public License from time to time. Such new versions will\
-be similar in spirit to the present version, but may differ in detail to\
-address new problems or concerns.\
-\
-Each version is given a distinguishing version number. If the Program\
-specifies a version number of this License which applies to it and "any\
-later version", you have the option of following the terms and conditions\
-either of that version or of any later version published by the Free\
-Software Foundation. If the Program does not specify a version number of\
-this License, you may choose any version ever published by the Free Software\
-Foundation.\
-\
- 10. If you wish to incorporate parts of the Program into other free\
-programs whose distribution conditions are different, write to the author\
-to ask for permission. For software which is copyrighted by the Free\
-Software Foundation, write to the Free Software Foundation; we sometimes\
-make exceptions for this. Our decision will be guided by the two goals\
-of preserving the free status of all derivatives of our free software and\
-of promoting the sharing and reuse of software generally.\
-\
- NO WARRANTY\
-\
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN\
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED\
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS\
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE\
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\
-REPAIR OR CORRECTION.\
-\
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\
-POSSIBILITY OF SUCH DAMAGES.\
-\
- END OF TERMS AND CONDITIONS\
-\
- How to Apply These Terms to Your New Programs\
-\
- If you develop a new program, and you want it to be of the greatest\
-possible use to the public, the best way to achieve this is to make it\
-free software which everyone can redistribute and change under these terms.\
-\
- To do so, attach the following notices to the program. It is safest\
-to attach them to the start of each source file to most effectively\
-convey the exclusion of warranty; and each file should have at least\
-the "copyright" line and a pointer to where the full notice is found.\
-\
- <one line to give the program's name and a brief idea of what it does.>\
- Copyright (C) <year> <name of author>\
-\
- This program is free software; you can redistribute it and/or modify\
- it under the terms of the GNU General Public License as published by\
- the Free Software Foundation; either version 2 of the License, or\
- (at your option) any later version.\
-\
- This program is distributed in the hope that it will be useful,\
- but WITHOUT ANY WARRANTY; without even the implied warranty of\
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\
- GNU General Public License for more details.\
-\
- You should have received a copy of the GNU General Public License along\
- with this program; if not, write to the Free Software Foundation, Inc.,\
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\
-\
-Also add information on how to contact you by electronic and paper mail.\
-\
-If the program is interactive, make it output a short notice like this\
-when it starts in an interactive mode:\
-\
- Gnomovision version 69, Copyright (C) year name of author\
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\
- This is free software, and you are welcome to redistribute it\
- under certain conditions; type `show c' for details.\
-\
-The hypothetical commands `show w' and `show c' should show the appropriate\
-parts of the General Public License. Of course, the commands you use may\
-be called something other than `show w' and `show c'; they could even be\
-mouse-clicks or menu items--whatever suits your program.\
-\
-You should also get your employer (if you work as a programmer) or your\
-school, if any, to sign a "copyright disclaimer" for the program, if\
-necessary. Here is a sample; alter the names:\
-\
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program\
- `Gnomovision' (which makes passes at compilers) written by James Hacker.\
-\
- <signature of Ty Coon>, 1 April 1989\
- Ty Coon, President of Vice\
-\
-This General Public License does not permit incorporating your program into\
-proprietary programs. If your program is a subroutine library, you may\
-consider it more useful to permit linking proprietary applications with the\
-library. If this is what you want to do, use the GNU Lesser General\
-Public License instead of this License.\
-}
11 packages/osx/Makefile.am
View
@@ -1,17 +1,6 @@
## Cherokee: Makefile.am -*- makefile -*-
-BINARIES = \
-License.rtf \
-background.tiff.gz \
-cherokee_icon.icns
-
-PYTHON = \
-utils.py \
-build.py
-
EXTRA_DIST = \
-$(PYTHON) \
-$(BINARIES) \
Info.plist \
Info.plist.in \
Description.plist \
BIN  packages/osx/background.tiff.gz
View
Binary file not shown
130 packages/osx/build.py
View
@@ -1,130 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import re
-from utils import *
-
-MAKE_PARAMS = "-j4"
-TMP = "/var/tmp"
-PKG_MAKER = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"
-
-
-def _figure_version (path):
- info = open (os.path.join (path, "Info.plist"), 'r').read()
- regex = r"<key>CFBundleShortVersionString</key>[ \n\r]*<string>(.+)</string>"
- return re.findall(regex, info, re.MULTILINE)[0]
-
-
-# Globals
-osx_dir = os.path.abspath (os.path.dirname(__file__))
-src_topdir = os.path.abspath ("%s/../.."%(osx_dir))
-version = _figure_version (osx_dir)
-dmg_dir = "%s/Cherokee-dmg" % (osx_dir)
-dmg_rw_path = "%s/Cherokee-%s-RW.dmg" % (osx_dir, version)
-dmg_fullpath = "%s/Cherokee-%s.dmg" % (osx_dir, version)
-
-
-def _clean_up():
- cherokee_destdir = "%s/cherokee-destdir" %(TMP)
-
- exe ("sudo rm -rfv %s" % (cherokee_destdir), colorer=red)
- exe ("sudo rm -rfv %s %s" % (dmg_dir, dmg_fullpath), colorer=red)
- exe ("mkdir -p %s %s" % (dmg_dir, cherokee_destdir))
-
-
-def _build_cherokee():
- destdir = "%s/cherokee-destdir" %(TMP)
- root_dir = "%s/cherokee-destdir/root" %(TMP)
- resource_dir = "%s/cherokee-destdir/resources" %(TMP)
-
- # Ensure it's compiled
- chdir (src_topdir)
- exe ("make %s" % (MAKE_PARAMS))
-
- # Install it
- exe ("sudo make install DESTDIR=%s" % (root_dir))
- exe ("sudo mv %s/usr/local/etc/cherokee/cherokee.conf %s/usr/local/etc/cherokee/cherokee.conf.example" % (root_dir, root_dir), colorer=red)
-
- # Fix permissions (TODO)
- None
-
- # Copy resources
- exe ("mkdir -p %s" %(resource_dir), colorer=blue)
-
- exe ("cp -v %s/Info.plist %s" %(osx_dir, resource_dir), colorer=green)
- exe ("cp -v %s/Description.plist %s" %(osx_dir, resource_dir), colorer=green)
- exe ("cp -v %s/License.rtf %s" %(osx_dir, resource_dir), colorer=green)
- exe ("gunzip --stdout %s/background.tiff.gz > %s/background.tiff" % (osx_dir, resource_dir), colorer=green)
-
- # Build pkg
- exe ("rm -rfv %s/cherokee.pkg" %(dmg_dir), colorer=red)
-
- chdir ('%s/usr/local' %(root_dir))
-
- exe ("%s --verbose " % (PKG_MAKER) +
- "--id org.cherokee.webserver " +
- "--root %s/usr/local " % (root_dir) +
- "--domain system " +
- "--root-volume-only " +
- "--info %s/Info.plist " %(resource_dir) +
- "--resources %s " %(resource_dir) +
- "--version %s " %(version) +
- "--out %s/cherokee.pkg" %(dmg_dir))
-
-def _copy_cherokee_app():
- exe ("cp -rv %s/Cherokee-admin.app '%s/Cherokee Admin.app'" %(osx_dir, dmg_dir))
- exe ("cp -rv %s/dmg-background.png '%s/background.png'" %(osx_dir, dmg_dir))
- exe ("ln -s /Applications %s/Applications" %(dmg_dir))
-
-## http://efreedom.com/Question/1-96882/Create-Nice-Looking-DMG-Mac-OS-Using-Command-Line-Tools
-## http://clanmills.com/articles/macinstallers/
-
-def _build_dmg():
- chdir (TMP)
-
- # RW version
- exe ("hdiutil create -verbose -format UDRW " +
- "-volname Cherokee-%s " %(version) +
- "-srcfolder %s " %(dmg_dir) +
- "%s" %(dmg_fullpath), colorer=green)
-
- # Attach
- path = exe_output ("hdiutil attach %s | sed -n 's/.*\(\/Volumes\/.*\)/\1/p'" %(dmg_fullpath))
- print "path", path
-
- exe ("ls -l %s" % (dmg_fullpath))
-
-
-def perform():
- # Change the current directory
- prev_dir = chdir (TMP)
-
- # Perform
- try:
- _clean_up()
- _build_cherokee()
- _copy_cherokee_app()
- _build_dmg()
- except:
- chdir (prev_dir)
- raise
-
- # Done and dusted
- chdir (prev_dir)
- print yellow("Done and dusted!")
-
-
-def check_preconditions():
- conf = os.path.join (src_topdir, "cherokee.conf.sample")
- assert "server!user = www" in open(conf).read(), "Bad user"
- assert "server!group = www" in open(conf).read(), "Bad group"
- assert "prefix = /usr/local" in open("Makefile").read(), "Wrong configuration"
- assert os.access (TMP, os.W_OK), "Cannot compile in: %s" %(TMP)
- assert which("hdiutil"), "hdiutil is required"
- assert which("gunzip"), "gunzip is required"
- assert which("svn"), "SVN is required"
-
-
-if __name__ == "__main__":
- check_preconditions()
- perform()
BIN  packages/osx/cherokee_icon.icns
View
Binary file not shown
75 packages/osx/utils.py
View
@@ -1,75 +0,0 @@
-import os
-import subprocess
-
-
-# Colors
-#
-ESC = chr(27) + '['
-RESET = '%s0m' % (ESC)
-
-def green (s):
- return ESC + '0;32m' + s + RESET
-
-def red (s):
- return ESC + '0;31m' + s + RESET
-
-def yellow (s):
- return ESC + '1;33m' + s + RESET
-
-def blue (s):
- return ESC + '0;34m' + s + RESET
-
-
-# Utilies
-#
-def prepend_env (var, value):
- prev = os.getenv(var)
- os.putenv(var, "%s:%s"%(value, prev))
- return prev
-
-def chdir (dir):
- if '*' in dir or '?' in dir:
- tmp = exe_output ("ls -1d %s" %(dir))
- dir = tmp.split('\n')[0]
- current = os.getcwd()
- os.chdir (dir)
- return current
-
-def exe_output (cmd):
- p = subprocess.Popen (cmd, shell=True, stdout=subprocess.PIPE)
- return p.stdout.read()
-
-def exe (cmd, colorer=lambda x: x, return_fatal=True):
- print cmd
-
- p = subprocess.Popen (cmd, shell=True, stdout=subprocess.PIPE)
- while True:
- line = p.stdout.readline()
- if not line:
- break
- print colorer(line.rstrip('\n\r'))
-
- p.wait()
- if return_fatal:
- if p.returncode != 0:
- print '\n%s: Could execute: %s' %(red('ERROR'), cmd)
-
- assert p.returncode == 0, "Execution failed"
-
- return p.returncode
-
-def which (program):
- def is_exe(fpath):
- return os.path.exists(fpath) and os.access(fpath, os.X_OK)
-
- fpath, fname = os.path.split(program)
- if fpath:
- if is_exe(program):
- return program
- else:
- for path in os.environ["PATH"].split(os.pathsep):
- exe_file = os.path.join(path, program)
- if is_exe(exe_file):
- return exe_file
-
- return None
Please sign in to comment.
Something went wrong with that request. Please try again.