Skip to content

Commit

Permalink
Bugfix
Browse files Browse the repository at this point in the history
  • Loading branch information
@krystian-panek-vmltech
krystian-panek-vmltech committed Dec 15, 2022
1 parent c05c3bf commit 441b299
Show file tree
Hide file tree
Showing 18 changed files with 48 additions and 48 deletions.
4 changes: 2 additions & 2 deletions .run/config_print.run.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<parameters value="config print" />
<kind value="DIRECTORY" />
<package value="github.com/wttech/aemc" />
<directory value="$PROJECT_DIR$/cmd/cli" />
<directory value="$PROJECT_DIR$/cmd/aem" />
<filePath value="$PROJECT_DIR$/cmd/aem/main.go" />
<method v="2" />
</configuration>
</component>
</component>
4 changes: 2 additions & 2 deletions .run/instance_await_run.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parameters value="instance await" />
<kind value="DIRECTORY" />
<package value="github.com/wttech/aemc" />
<directory value="$PROJECT_DIR$/cmd/cli" />
<directory value="$PROJECT_DIR$/cmd/aem" />
<method v="2" />
</configuration>
</component>
</component>
4 changes: 2 additions & 2 deletions .run/instance_create.run.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<parameters value="instance create" />
<kind value="DIRECTORY" />
<package value="github.com/wttech/aemc" />
<directory value="$PROJECT_DIR$/cmd/cli" />
<directory value="$PROJECT_DIR$/cmd/aem" />
<filePath value="$PROJECT_DIR$/cmd/aem/main.go" />
<method v="2" />
</configuration>
</component>
</component>
4 changes: 2 additions & 2 deletions .run/instance_delete.run.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<parameters value="instance delete" />
<kind value="DIRECTORY" />
<package value="github.com/wttech/aemc" />
<directory value="$PROJECT_DIR$/cmd/cli" />
<directory value="$PROJECT_DIR$/cmd/aem" />
<filePath value="$PROJECT_DIR$/cmd/aem/main.go" />
<method v="2" />
</configuration>
</component>
</component>
4 changes: 2 additions & 2 deletions .run/instance_down.run.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<parameters value="instance stop" />
<kind value="DIRECTORY" />
<package value="github.com/wttech/aemc" />
<directory value="$PROJECT_DIR$/cmd/cli" />
<directory value="$PROJECT_DIR$/cmd/aem" />
<filePath value="$PROJECT_DIR$/cmd/aem/main.go" />
<method v="2" />
</configuration>
</component>
</component>
6 changes: 3 additions & 3 deletions .run/instance_status.run.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<parameters value="instance status --output-format yaml" />
<kind value="DIRECTORY" />
<package value="github.com/wttech/aemc" />
<directory value="$PROJECT_DIR$/cmd/cli" />
<filePath value="$PROJECT_DIR$/cmd/cli/main.go" />
<directory value="$PROJECT_DIR$/cmd/aem" />
<filePath value="$PROJECT_DIR$/cmd/aem/main.go" />
<method v="2" />
</configuration>
</component>
</component>
4 changes: 2 additions & 2 deletions .run/instance_up.run.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<parameters value="instance start" />
<kind value="DIRECTORY" />
<package value="github.com/wttech/aemc" />
<directory value="$PROJECT_DIR$/cmd/cli" />
<directory value="$PROJECT_DIR$/cmd/aem" />
<filePath value="$PROJECT_DIR$/cmd/aem/main.go" />
<method v="2" />
</configuration>
</component>
</component>
6 changes: 3 additions & 3 deletions .run/osgi_bundle_get.run.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<parameters value="osgi bundle get --symbolic-name com.adobe.cq.ups-profile-lookup -A" />
<kind value="DIRECTORY" />
<package value="github.com/wttech/aemc" />
<directory value="$PROJECT_DIR$/cmd/cli" />
<filePath value="$PROJECT_DIR$/cmd/cli/main.go" />
<directory value="$PROJECT_DIR$/cmd/aem" />
<filePath value="$PROJECT_DIR$/cmd/aem/main.go" />
<method v="2" />
</configuration>
</component>
</component>
6 changes: 3 additions & 3 deletions .run/osgi_bundle_list.run.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<parameters value="osgi bundle list -A" />
<kind value="DIRECTORY" />
<package value="github.com/wttech/aemc" />
<directory value="$PROJECT_DIR$/cmd/cli" />
<filePath value="$PROJECT_DIR$/cmd/cli/main.go" />
<directory value="$PROJECT_DIR$/cmd/aem" />
<filePath value="$PROJECT_DIR$/cmd/aem/main.go" />
<method v="2" />
</configuration>
</component>
</component>
6 changes: 3 additions & 3 deletions .run/osgi_bundle_read.run.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<parameters value="osgi bundle read -A --symbolic-name 'org.yaml.snakeyaml'" />
<kind value="DIRECTORY" />
<package value="github.com/wttech/aemc" />
<directory value="$PROJECT_DIR$/cmd/cli" />
<filePath value="$PROJECT_DIR$/cmd/cli/main.go" />
<directory value="$PROJECT_DIR$/cmd/aem" />
<filePath value="$PROJECT_DIR$/cmd/aem/main.go" />
<method v="2" />
</configuration>
</component>
</component>
6 changes: 3 additions & 3 deletions .run/osgi_bundle_start.run.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<parameters value="osgi bundle start --symbolic-name 'org.apache.sling.jcr.davex' -A" />
<kind value="DIRECTORY" />
<package value="github.com/wttech/aemc" />
<directory value="$PROJECT_DIR$/cmd/cli" />
<filePath value="$PROJECT_DIR$/cmd/cli/main.go" />
<directory value="$PROJECT_DIR$/cmd/aem" />
<filePath value="$PROJECT_DIR$/cmd/aem/main.go" />
<method v="2" />
</configuration>
</component>
</component>
6 changes: 3 additions & 3 deletions .run/osgi_bundle_stop.run.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<parameters value="osgi bundle stop --symbolic-name 'org.apache.sling.jcr.davex' -A" />
<kind value="DIRECTORY" />
<package value="github.com/wttech/aemc" />
<directory value="$PROJECT_DIR$/cmd/cli" />
<filePath value="$PROJECT_DIR$/cmd/cli/main.go" />
<directory value="$PROJECT_DIR$/cmd/aem" />
<filePath value="$PROJECT_DIR$/cmd/aem/main.go" />
<method v="2" />
</configuration>
</component>
</component>
6 changes: 3 additions & 3 deletions .run/osgi_config_list.run.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<parameters value="osgi config list -A" />
<kind value="DIRECTORY" />
<package value="github.com/wttech/aemc" />
<directory value="$PROJECT_DIR$/cmd/cli" />
<filePath value="$PROJECT_DIR$/cmd/cli/main.go" />
<directory value="$PROJECT_DIR$/cmd/aem" />
<filePath value="$PROJECT_DIR$/cmd/aem/main.go" />
<method v="2" />
</configuration>
</component>
</component>
6 changes: 3 additions & 3 deletions .run/osgi_config_read.run.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<parameters value="osgi config get --pid org.apache.sling.sitemap.impl.SitemapServlet -A" />
<kind value="DIRECTORY" />
<package value="github.com/wttech/aemc" />
<directory value="$PROJECT_DIR$/cmd/cli" />
<filePath value="$PROJECT_DIR$/cmd/cli/main.go" />
<directory value="$PROJECT_DIR$/cmd/aem" />
<filePath value="$PROJECT_DIR$/cmd/aem/main.go" />
<method v="2" />
</configuration>
</component>
</component>
6 changes: 3 additions & 3 deletions .run/osgi_config_save.run.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<parameters value="osgi config save --pid 'org.apache.sling.jcr.davex.impl.servlets.SlingDavExServlet' -A --input-string 'alias: /crx/server'" />
<kind value="DIRECTORY" />
<package value="github.com/wttech/aemc" />
<directory value="$PROJECT_DIR$/cmd/cli" />
<filePath value="$PROJECT_DIR$/cmd/cli/main.go" />
<directory value="$PROJECT_DIR$/cmd/aem" />
<filePath value="$PROJECT_DIR$/cmd/aem/main.go" />
<method v="2" />
</configuration>
</component>
</component>
6 changes: 3 additions & 3 deletions .run/repl_agent_read.run.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<parameters value="repl agent read --location author --name publish -A" />
<kind value="DIRECTORY" />
<package value="github.com/wttech/aemc" />
<directory value="$PROJECT_DIR$/cmd/cli" />
<filePath value="$PROJECT_DIR$/cmd/cli/main.go" />
<directory value="$PROJECT_DIR$/cmd/aem" />
<filePath value="$PROJECT_DIR$/cmd/aem/main.go" />
<method v="2" />
</configuration>
</component>
</component>
10 changes: 5 additions & 5 deletions pkg/cfg/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ import (
)

const (
EnvPrefix = "AEM"
InputStdin = "STDIN"

FilePathDefault = common.HomeDir + "/aem.yml"
FilePathEnvVar = "AEM_CONFIG_PATH"
EnvPrefix = "AEM"
InputStdin = "STDIN"
OutputFileDefault = common.HomeDir + "/aem.log"
FilePathDefault = common.HomeDir + "/aem.yml"
FilePathEnvVar = "AEM_CONFIG_PATH"
)

// Config defines a place for managing input configuration from various sources (YML file, env vars, etc)
Expand Down
2 changes: 1 addition & 1 deletion pkg/cfg/defaults.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ func setDefaults(v *viper.Viper) {
v.SetDefault("input.format", fmtx.YML)
v.SetDefault("input.file", InputStdin)
v.SetDefault("output.format", fmtx.Text)
v.SetDefault("output.file", FilePathDefault)
v.SetDefault("output.file", OutputFileDefault)

v.SetDefault("instance.processing_mode", instance.ProcessingAuto)
}

0 comments on commit 441b299

Please sign in to comment.