Merge pull request #69 from singularityware/v3.3.0

Updating v3.3.0 to be on master

Author: vsoch

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016-2018 Vanessa Sochat
+Copyright (c) 2016-2019 Vanessa Sochat
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -55,7 +55,7 @@ If you want a legacy version, see the following other branches:
  - [v2.5](https://github.com/singularityware/docker2singularity/tree/v2.5): Version 2.5.1 of Singularity. Same as 2.4 but with many bug fixes.
  - [v2.6](https://github.com/singularityware/docker2singularity/tree/v2.6): Version 2.6 of Singularity.
 
-Intermediate versions built on [Docker Hub](https://hub.docker.com/r/singularityware/docker2singularity/tags/). A tag with prefix `v` corresponds to a release of the Singularity software, while the others are in reference to releases of Docker.
+Intermediate versions built on [Docker Hub](https://hub.docker.com/r/singularityware/docker2singularity/tags/). A tag with prefix `v` corresponds to a release of the Singularity software, while the others are in reference to releases of Docker. Previously used [scripts](https://github.com/singularityware/docker2singularity/tree/master/scripts), including environment and action files, are provided in this repository for reference.
 
 ## Requirements
 

docker2singularity.sh

@@ -269,9 +269,10 @@ chmod +x $build_sandbox/.singularity.d/runscript;
 
 echo "(5/10) Setting ENV variables..."
 
-# First add templates for actions and env
-cp -R /scripts/env $build_sandbox/.singularity.d/
-cp -R /scripts/actions $build_sandbox/.singularity.d/
+# Removed copying of template files to avoid scripts permissions issue (see #66)
+# Create env scripts directory
+mkdir -p $build_sandbox/.singularity.d/env
+chmod 755 $build_sandbox/.singularity.d/env
 
 # Then customize by adding Docker variables
 docker run --rm --entrypoint="/usr/bin/env" $image > $TMPDIR/docker_environment