Merge branch 'small_fixes' into push-command

# Conflicts:
#	pkg/content_manager.go

Author: dominik-przybyl-wttech

pkg/content_manager.go

@@ -63,9 +63,9 @@ func (cm *ContentManager) Download(localFile string, packageOpts PackageCreateOp
 	return nil
 }
 
-func (cm *ContentManager) PullDir(dir string, clean bool, replace bool, packageOpts PackageCreateOpts) error {
+func (cm *ContentManager) PullDir(dir string, clean bool, replace bool, opts PackageCreateOpts) error {
 	pkgFile := pathx.RandomFileName(cm.tmpDir(), "content_pull", ".zip")
-	if err := cm.Download(pkgFile, packageOpts); err != nil {
+	if err := cm.Download(pkgFile, opts); err != nil {
 		return err
 	}
 	workDir := pathx.RandomDir(cm.tmpDir(), "content_pull")
@@ -100,9 +100,9 @@ func (cm *ContentManager) PullDir(dir string, clean bool, replace bool, packageO
 	return nil
 }
 
-func (cm *ContentManager) PullFile(file string, clean bool, packageOpts PackageCreateOpts) error {
+func (cm *ContentManager) PullFile(file string, clean bool, opts PackageCreateOpts) error {
 	pkgFile := pathx.RandomFileName(cm.tmpDir(), "content_pull", ".zip")
-	if err := cm.Download(pkgFile, packageOpts); err != nil {
+	if err := cm.Download(pkgFile, opts); err != nil {
 		return err
 	}
 	workDir := pathx.RandomDir(cm.tmpDir(), "content_pull")
@@ -202,20 +202,20 @@ func determineCleanFile(file string) string {
 	return file
 }
 
-func (cm *ContentManager) Copy(destInstance *Instance, clean bool, packageOpts PackageCreateOpts) error {
+func (cm *ContentManager) Copy(destInstance *Instance, clean bool, opts PackageCreateOpts) error {
 	var pkgFile = pathx.RandomFileName(cm.tmpDir(), "content_copy", ".zip")
 	defer func() { _ = pathx.DeleteIfExists(pkgFile) }()
 	if clean {
 		workDir := pathx.RandomDir(cm.tmpDir(), "content_copy")
 		defer func() { _ = pathx.DeleteIfExists(workDir) }()
-		if err := cm.PullDir(filepath.Join(workDir, content.JCRRoot), clean, false, packageOpts); err != nil {
+		if err := cm.PullDir(filepath.Join(workDir, content.JCRRoot), clean, false, opts); err != nil {
 			return err
 		}
 		if err := content.Zip(workDir, pkgFile); err != nil {
 			return err
 		}
 	} else {
-		if err := cm.Download(pkgFile, packageOpts); err != nil {
+		if err := cm.Download(pkgFile, opts); err != nil {
 			return err
 		}
 	}