From f447df90fbe0b23947af8321609088054786f0ae Mon Sep 17 00:00:00 2001 From: zeldaroot Date: Tue, 26 Nov 2019 16:51:04 +0200 Subject: [PATCH] Added ignore files, fixed interactive install --- .dockerignore | 24 ++++++++++++++++++++++++ .gitignore | 20 ++++++++++++++++++++ .prettierignore | 27 +++++++++++++++++++++++++++ cinemapress.sh | 47 +++++++++++++++++++---------------------------- 4 files changed, 90 insertions(+), 28 deletions(-) create mode 100644 .dockerignore create mode 100644 .gitignore create mode 100644 .prettierignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..cec5663 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,24 @@ +Thumbs.db +.idea/ +lib-cov/ +*.seed +*.log +*.csv +*.dat +*.out +*.pid +*.gz +/themes/* +!/themes/default/ + +doc/ +pids/ +logs/ +results/ +build/ + +node_modules/ +package-lock.json +.dockerignore +.gitignore +.prettierignore \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..11f3e03 --- /dev/null +++ b/.gitignore @@ -0,0 +1,20 @@ +Thumbs.db +.idea/ +lib-cov/ +*.seed +*.log +*.csv +*.dat +*.out +*.pid +*.gz +/themes/* +!/themes/default/ + +pids/ +logs/ +results/ +build/ + +node_modules/ +package-lock.json \ No newline at end of file diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..9f6bdbb --- /dev/null +++ b/.prettierignore @@ -0,0 +1,27 @@ +Thumbs.db +.idea/ +lib-cov/ +*.seed +*.log +*.csv +*.dat +*.out +*.pid +*.gz +*.md +*.min.* +/themes/* +!/themes/default/ +config.js +modules.js + +pids/ +logs/ +results/ +build/ + +node_modules/ +package-lock.json +.dockerignore +.gitignore +.prettierignore \ No newline at end of file diff --git a/cinemapress.sh b/cinemapress.sh index 5fb668c..bbedcab 100644 --- a/cinemapress.sh +++ b/cinemapress.sh @@ -10,7 +10,6 @@ NC='\033[0m' OPTION=${1:-} GIT_SERVER="github.com" -GIT_NAME="CinemaPress" CP_VER="4.0.0" CP_ALL="" PRC_=0 @@ -41,7 +40,7 @@ if [ "${CP_OS}" = "alpine" ] || [ "${CP_OS}" = "\"alpine\"" ] || \ [ "${CP_OS}" = "ubuntu" ] || [ "${CP_OS}" = "\"ubuntu\"" ] || \ [ "${CP_OS}" = "fedora" ] || [ "${CP_OS}" = "\"fedora\"" ] || \ [ "${CP_OS}" = "centos" ] || [ "${CP_OS}" = "\"centos\"" ]; then - CP_SUCCESS="yes" + true else _header "ERROR" _content @@ -84,20 +83,16 @@ docker_install() { if [ "`basename "${0}"`" != "cinemapress" ]; then echo ""; echo -n "Installing packages ..." if [ "${CP_OS}" = "debian" ] || [ "${CP_OS}" = "\"debian\"" ]; then - apt-get -y -qq install sudo >>/var/log/docker_install_$(date '+%d_%m_%Y').log 2>&1 - sudo apt-get -y -qq update >>/var/log/docker_install_$(date '+%d_%m_%Y').log 2>&1 - sudo apt-get -y -qq install wget curl nano htop lsb-release ca-certificates git-core openssl netcat cron gzip bzip2 unzip gcc make libssl-dev locales lsof net-tools >>/var/log/docker_install_$(date '+%d_%m_%Y').log 2>&1 + DEBIAN_FRONTEND=noninteractive apt-get -y -qq update >>/var/log/docker_install_$(date '+%d_%m_%Y').log 2>&1 + DEBIAN_FRONTEND=noninteractive apt-get -y -qq install sudo wget curl nano htop lsb-release ca-certificates git-core openssl netcat cron gzip bzip2 unzip gcc make libssl-dev locales lsof net-tools >>/var/log/docker_install_$(date '+%d_%m_%Y').log 2>&1 elif [ "${CP_OS}" = "ubuntu" ] || [ "${CP_OS}" = "\"ubuntu\"" ]; then - apt-get -y -qq install sudo >>/var/log/docker_install_$(date '+%d_%m_%Y').log 2>&1 - sudo apt-get -y -qq update >>/var/log/docker_install_$(date '+%d_%m_%Y').log 2>&1 - sudo apt-get -y -qq install wget curl nano htop lsb-release ca-certificates git-core openssl netcat cron gzip bzip2 unzip gcc make libssl-dev locales lsof net-tools >>/var/log/docker_install_$(date '+%d_%m_%Y').log 2>&1 + DEBIAN_FRONTEND=noninteractive apt-get -y -qq update >>/var/log/docker_install_$(date '+%d_%m_%Y').log 2>&1 + DEBIAN_FRONTEND=noninteractive apt-get -y -qq install sudo wget curl nano htop lsb-release ca-certificates git-core openssl netcat cron gzip bzip2 unzip gcc make libssl-dev locales lsof net-tools >>/var/log/docker_install_$(date '+%d_%m_%Y').log 2>&1 elif [ "${CP_OS}" = "fedora" ] || [ "${CP_OS}" = "\"fedora\"" ]; then - dnf -y install sudo >>/var/log/docker_install_$(date '+%d_%m_%Y').log 2>&1 - sudo dnf -y install wget curl nano htop lsb-release ca-certificates git-core openssl netcat cron gzip bzip2 unzip gcc make libssl-dev locales lsof >>/var/log/docker_install_$(date '+%d_%m_%Y').log 2>&1 + dnf -y install sudo wget curl nano htop lsb-release ca-certificates git-core openssl netcat cron gzip bzip2 unzip gcc make libssl-dev locales lsof >>/var/log/docker_install_$(date '+%d_%m_%Y').log 2>&1 elif [ "${CP_OS}" = "centos" ] || [ "${CP_OS}" = "\"centos\"" ]; then yum install -y epel-release >>/var/log/docker_install_$(date '+%d_%m_%Y').log 2>&1 - yum install -y sudo >>/var/log/docker_install_$(date '+%d_%m_%Y').log 2>&1 - sudo yum install -y wget curl nano htop lsb-release ca-certificates git-core openssl netcat cron gzip bzip2 unzip gcc make libssl-dev locales lsof net-tools >>/var/log/docker_install_$(date '+%d_%m_%Y').log 2>&1 + yum install -y sudo wget curl nano htop lsb-release ca-certificates git-core openssl netcat cron gzip bzip2 unzip gcc make libssl-dev locales lsof net-tools >>/var/log/docker_install_$(date '+%d_%m_%Y').log 2>&1 fi sudo wget -qO /usr/bin/cinemapress https://gitlab.com/CinemaPress/CinemaPress/raw/master/cinemapress.sh && \ chmod +x /usr/bin/cinemapress @@ -114,9 +109,9 @@ docker_install() { _s if [ "${CP_OS}" = "debian" ] || [ "${CP_OS}" = "\"debian\"" ]; then CP_ARCH="`dpkg --print-architecture`" - sudo apt-get -y -qq remove docker docker-engine docker.io containerd runc - sudo apt-get -y -qq update - sudo apt-get -y -qq install \ + sudo DEBIAN_FRONTEND=noninteractive apt-get -y -qq remove docker docker-engine docker.io containerd runc + sudo DEBIAN_FRONTEND=noninteractive apt-get -y -qq update + sudo DEBIAN_FRONTEND=noninteractive apt-get -y -qq install \ apt-transport-https \ ca-certificates \ curl \ @@ -135,16 +130,14 @@ docker_install() { CP_ARCH="arm64" fi sudo add-apt-repository \ - "deb [arch=${CP_ARCH}] https://download.docker.com/linux/debian \ - $(lsb_release -cs) \ - stable" - sudo apt-get -y -qq update - sudo apt-get -y -qq install docker-ce docker-ce-cli containerd.io + "deb [arch=${CP_ARCH}] https://download.docker.com/linux/debian $(lsb_release -cs) stable" + sudo DEBIAN_FRONTEND=noninteractive apt-get -y -qq update + sudo DEBIAN_FRONTEND=noninteractive apt-get -y -qq install docker-ce docker-ce-cli containerd.io elif [ "${CP_OS}" = "ubuntu" ] || [ "${CP_OS}" = "\"ubuntu\"" ]; then CP_ARCH="`dpkg --print-architecture`" - sudo apt-get -y -qq remove docker docker-engine docker.io containerd runc - sudo apt-get -y -qq update - sudo apt-get -y -qq install \ + sudo DEBIAN_FRONTEND=noninteractive apt-get -y -qq remove docker docker-engine docker.io containerd runc + sudo DEBIAN_FRONTEND=noninteractive apt-get -y -qq update + sudo DEBIAN_FRONTEND=noninteractive apt-get -y -qq install \ apt-transport-https \ ca-certificates \ curl \ @@ -169,11 +162,9 @@ docker_install() { CP_ARCH="s390x" fi sudo add-apt-repository \ - "deb [arch=${CP_ARCH}] https://download.docker.com/linux/ubuntu \ - $(lsb_release -cs) \ - stable" - sudo apt-get -y -qq update - sudo apt-get -y -qq install docker-ce docker-ce-cli containerd.io + "deb [arch=${CP_ARCH}] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" + sudo DEBIAN_FRONTEND=noninteractive apt-get -y -qq update + sudo DEBIAN_FRONTEND=noninteractive apt-get -y -qq install docker-ce docker-ce-cli containerd.io elif [ "${CP_OS}" = "fedora" ] || [ "${CP_OS}" = "\"fedora\"" ]; then sudo dnf -y remove docker \ docker-client \