From cf70a651f03a1dc0b8c815094a697350a1497625 Mon Sep 17 00:00:00 2001 From: Vladimir-A <32281993+Vladimir-A@users.noreply.github.com> Date: Tue, 15 Dec 2020 05:01:25 +0300 Subject: [PATCH 1/2] Add: apt-get -y install gcc g++ gcc, g ++ is required to building --- INSTALL.debian | 1 + 1 file changed, 1 insertion(+) diff --git a/INSTALL.debian b/INSTALL.debian index c435d7748..f158d1266 100644 --- a/INSTALL.debian +++ b/INSTALL.debian @@ -48,6 +48,7 @@ apt-get -y install zlib1g-dev libglib2.0-dev apt-get -y install $LIBSSL_DEV_PKG build-essential automake libxml2-dev libxslt-dev ncurses-dev sudo libreadline-dev flex bison ragel redis git curl libcurl4-openssl-dev sendmail-bin sendmail nginx ssh coreutils ffmpeg mkvtoolnix apt-get -y install libpq-dev postgresql-client apt-get -y install liblcms2-dev $LIBJPEG_TURBO_DEV_PKG libexpat1-dev libgif-dev libpng-dev libexif-dev +apt-get -y install gcc g++ curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list From 0f44d8b974d9f7421ba281d6ac358672731449b9 Mon Sep 17 00:00:00 2001 From: Vladimir-A <32281993+Vladimir-A@users.noreply.github.com> Date: Tue, 15 Dec 2020 05:15:57 +0300 Subject: [PATCH 2/2] Change: regular expressions. Add [^ -] to exclude duplicate. Example: PostgreSQL 11.9 (Debian 11.9-0+deb10u1) --- INSTALL.debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL.debian b/INSTALL.debian index f158d1266..a471b1eeb 100644 --- a/INSTALL.debian +++ b/INSTALL.debian @@ -77,7 +77,7 @@ chsh -s /bin/bash danbooru usermod -G danbooru,sudo danbooru # Set up Postgres -export PG_VERSION=`pg_config --version | egrep -o '[0-9]{1,}\.[0-9]{1,}'` +export PG_VERSION=`pg_config --version | egrep -o '[0-9]{1,}\.[0-9]{1,}[^-]'` if verlte 9.5 $PG_VERSION ; then # only do this on postgres 9.5 and above