Skip to content

Normalize Windows paths for forward slashes #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
npyoung wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Normalize Windows paths for forward slashes #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e29ec61
normalize Windows paths for forward slashes
npyoung Sep 24, 2015
f14b090
skip bash completion features on Windows
npyoung Mar 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions s4cmd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,9 @@ def put_single_file(self, pool, source, target):
target_url = S3URL(target)
# deal with ./ or ../ here by normalizing the path.
joined_path = os.path.normpath(os.path.join(target_url.path, os.path.relpath(f, source)))
# deal with Windows and other non-/ path separators
if os.sep != PATH_SEP:
joined_path = joined_path.replace(os.sep, PATH_SEP)
pool.upload(None, f, S3URL.combine('s3', target_url.bucket, joined_path))
else:
message('omitting directory "%s".' % source)
Expand Down
13 changes: 7 additions & 6 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,16 @@
__maintainer__ = __author__
__status__ = "Development"

def _post_install():
os.chmod("/etc/bash_completion.d/s4cmd",755)

class install(_install):
def run(self):
def run(self):
_install.run(self)
mode = stat.S_IREAD | stat.S_IWRITE | stat.S_IRGRP | stat.S_IROTH
os.chmod("/etc/bash_completion.d/s4cmd", mode)

if bash_complete:
os.chmod("/etc/bash_completion.d/s4cmd", mode)

bash_complete = os.name == 'posix'
data_files = [('/etc/bash_completion.d/',['data/bash-completion/s4cmd'])] if bash_complete else None

setup(name='s4cmd',
version=__version__,
Expand All @@ -50,6 +51,6 @@ def run(self):
py_modules=['s4cmd'],
scripts=['s4cmd', 's4cmd.py'], # Added s4cmd.py as script for backward compatibility
install_requires=['boto>=2.3.0'],
data_files=[('/etc/bash_completion.d/',['data/bash-completion/s4cmd'])],
data_files=data_files,
cmdclass={'install': install},
)