Merge pull request #19 from fledge-iot/FOGL-4715

FOGL-4715: Replaced master with main

Author: YashTatkondawar

README.rst

@@ -141,7 +141,7 @@ The make_rpm Script
 Building a RPM Package
 ======================
 
-``make_rpm`` script automatically do Fledge clone repo with branch master (by default) and then ``sudo make install`` followed by some prerequisite
+``make_rpm`` script automatically do Fledge clone repo with branch main (by default) and then ``sudo make install`` followed by some prerequisite
 
 You may override the branch with ``-b`` or skip Fledge build with ``-s``. For more info just see its help ``-h``
 

docker/Dockerfile

@@ -2,7 +2,7 @@ FROM ubuntu:18.04
 
 MAINTAINER Vaibhav Singhal "[email protected]"
 
-ARG FLEDGE_BRANCH=master
+ARG FLEDGE_BRANCH=main
 ENV FLEDGE_BRANCH ${FLEDGE_BRANCH}
 RUN apt-get update && apt-get -y upgrade
 RUN apt-get install -y git rsyslog

docker/README.md

@@ -25,7 +25,7 @@ https://docs.docker.com/engine/installation/linux/docker-ce/ubuntu/
 	docker build --tag fledge --build-arg FLEDGE_BRANCH=develop .
 ```
 
-where name of the image is fledge, FLEDGE_BRANCH is the branch to build (develop, master, 1.5.2 ,etc)
+where name of the image is fledge, FLEDGE_BRANCH is the branch to build (develop, main, 1.5.2 ,etc)
 
 ### Run container
 

make_rpm

@@ -23,7 +23,7 @@ set -e
 
 PKG_ROOT=`pwd`               # The script must be executed from the root git directory
 repo_name="fledge"           # Name of the Git repository
-branch="master"              # Default Git branch to use
+branch="main"              # Default Git branch to use
 pkg_name="fledge"           # Name of the package to build
 architecture="x86_64"        # The architecture for which the rpm should be created
 rhpg_pkg="rh-postgresql96"   # Name of the Red Hat package for postgres

plugins/make_deb

@@ -22,7 +22,7 @@
 set -e
 
 # Default branch to package
-BRANCH_NAME=master
+BRANCH_NAME=main
 USAGE="$(basename "$0") [-h] [-a] [-b <branch>] repository ...
 This script is used to create the Debian package for a Fledge plugin
 

plugins/make_rpm

@@ -22,7 +22,7 @@
 set -e
 
 # Default branch to package
-branch=master
+branch=main
 
 usage="$(basename "$0") [-a] [-c] [-h] [-b <branch>] repository ...
 This script is used to create the RPM package for a Fledge plugin

service/make_deb

@@ -22,7 +22,7 @@
 set -e
 
 # Default branch to package
-BRANCH_NAME=master
+BRANCH_NAME=main
 
 USAGE="$(basename "$0") [-h] [-a] [-b <branch>] repository ...
 This script is used to create the Debian package for a Fledge service

service/make_rpm

@@ -22,7 +22,7 @@
 set -e
 
 # Default branch to package
-BRANCH_NAME=master
+BRANCH_NAME=main
 
 USAGE="$(basename "$0") [-h] [-a] [-b <branch>] repository ...
 This script is used to create the RPM package for a Fledge service