From 17f5afe61ed2a4b1df3ba9602be70a81226ac161 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Tue, 28 May 2019 17:14:47 -0700 Subject: [PATCH] rename default config file Signed-off-by: Jeff Carr --- Makefile | 5 +---- config.go | 2 +- resources/{protobuf-config.json => cloud-control-panel.json} | 0 3 files changed, 2 insertions(+), 5 deletions(-) rename resources/{protobuf-config.json => cloud-control-panel.json} (100%) diff --git a/Makefile b/Makefile index 7a5e5f6..c01f7ae 100644 --- a/Makefile +++ b/Makefile @@ -48,10 +48,7 @@ json-readable: cat ~/.config/cloud-control-panel.json |jq -r --tab json-restore: - cp resources/protobuf-config.json ~/.config/cloud-control-panel.json - -json-test: - cp resources/test.json ~/.config/cloud-control-panel.json + cp resources/cloud-control-panel.json ~/.config/cloud-control-panel.json json-delete: mv ~/.config/cloud-control-panel.json /tmp diff --git a/config.go b/config.go index 410b0b8..daae098 100644 --- a/config.go +++ b/config.go @@ -172,7 +172,7 @@ func loadConfigFromFilename(filename string) pb.Config { func loadDefaultConfig() pb.Config { log.Println("TRY TO LOAD DEFAULT CONFIG") // defaultConfig, _ := packrBox.FindString("protobuf-config.json") - b, err := packrBox.FindString("protobuf-small.json") + b, err := packrBox.FindString("cloud-control-panel.json") log.Println("b =", b) log.Println("err =", err) // var newpb *pb.Config diff --git a/resources/protobuf-config.json b/resources/cloud-control-panel.json similarity index 100% rename from resources/protobuf-config.json rename to resources/cloud-control-panel.json