diff --git a/component-installer.sh b/component-installer.sh index 7cb7128..34819a3 100644 --- a/component-installer.sh +++ b/component-installer.sh @@ -82,7 +82,7 @@ OGBOOT_REPO="$OPENGNSYS_BASE_URL/ogboot.git" OGCORE_REPO="$OPENGNSYS_BASE_URL/ogcore.git" OGDHCP_REPO="$OPENGNSYS_BASE_URL/ogdhcp.git" OGGUI_REPO="$OPENGNSYS_BASE_URL/oggui.git" -OGREPOSITORY_REPO="$OPENGNSYS_BASE_URL/ogrepo.git" +OGREPOSITORY_REPO="$OPENGNSYS_BASE_URL/ogrepository.git" export GIT_SSL_NO_VERIFY=1 echo ======================================== > /etc/issue diff --git a/component-installer/component-installer.sh b/component-installer/component-installer.sh index 2ee6757..6aca455 100644 --- a/component-installer/component-installer.sh +++ b/component-installer/component-installer.sh @@ -87,7 +87,7 @@ EOF } -function git_checkout_relaase() { +function git_checkout_release() { git clone --no-checkout "$1" "$2" cd "$2" || exit git checkout tags/"$3" @@ -117,10 +117,10 @@ do echo "Instalando ogCore..." OGCORE_BRANCH=$(jq -r '.container_version' /opt/opengnsys/ogCore/installer/config.json) container_version=$(jq -r '.container_version' /opt/opengnsys/ogCore/installer/config.json) - git_checkout_relaase "$OGCORE_REPO" "$component_dir/repo" "$OGCORE_BRANCH" + git_checkout_release "$OGCORE_REPO" "$component_dir/repo" "$OGCORE_BRANCH" mkdir -p $component_dir/etc/ mkdir -p $component_dir/bin/ - cp provision_ogcore.sh $component_dir/bin/ + cp $CONFIGS_DIR/provision_ogcore.sh $component_dir/bin/ chmod 755 $component_dir/bin/provision_ogcore.sh cp $component_dir/repo/docker-compose-deploy.yml $component_dir/etc/ sed -i "s/static/$container_version/g" $component_dir/repo/docker-compose-deploy.yml @@ -132,26 +132,26 @@ do echo "Instalando ogGui..." OGGUI_BRANCH=$(jq -r '.container_version' /opt/opengnsys/ogGui/installer/config.json) mkdir -p $component_dir/bin - cp provision_oggui.sh $component_dir/bin/ + cp $CONFIGS_DIR/provision_oggui.sh $component_dir/bin/ chmod 755 $component_dir/bin/provision_oggui.sh - git_checkout_relaase "$OGGUI_REPO" "$component_dir/repo" "$OGGUI_BRANCH" + git_checkout_release "$OGGUI_REPO" "$component_dir/repo" "$OGGUI_BRANCH" echo - ogGui >> /etc/issue install_docker install_oggui_docker ;; ogDhcp) echo "Instalando ogDhcp..." - git_checkout_relaase "$OGDHCP_REPO" "$component_dir/repo" "$OGCORE_BRANCH" + git_checkout_release "$OGDHCP_REPO" "$component_dir/repo" "$OGCORE_BRANCH" echo - ogDhcp >> /etc/issue ;; ogBoot) echo "Instalando ogBoot..." - git_checkout_relaase "$OGBOOT_REPO" "$component_dir/repo" "$OGCORE_BRANCH" + git_checkout_release "$OGBOOT_REPO" "$component_dir/repo" "$OGCORE_BRANCH" echo - ogBoot >> /etc/issue ;; ogRepository) echo "Instalando ogRepository..." - git_checkout_relaase "$OGREPOSITORY_REPO" "$component_dir/repo" "$OGCORE_BRANCH" + git_checkout_release "$OGREPOSITORY_REPO" "$component_dir/repo" "$OGCORE_BRANCH" echo - ogRepository >> /etc/issue ;; *) diff --git a/python-installer/oginstaller.sh b/python-installer/oginstaller.sh index dc8efc7..1523fe1 100755 --- a/python-installer/oginstaller.sh +++ b/python-installer/oginstaller.sh @@ -12,7 +12,7 @@ export GIT_SSL_NO_VERIFY install_packages() { apt-get update - apt-get install -y curl jq unzip python3 + apt-get install -y curl jq unzip python3 python3-git } download_installer() {