"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "lib/ubuntu/config.sh" between
fogproject-1.5.7.tar.gz and fogproject-1.5.8.tar.gz

About: FOG is a Linux-based network computer cloning solution for Windows, Mac OSX and various Linux distributions that ties together a few open-source tools with a PHP-based web interface. FOG doesn’t use any boot disks, or CDs; everything is done via TFTP and PXE.

[ To the main fogproject source changes report ]

config.sh  (fogproject-1.5.7):config.sh  (fogproject-1.5.8)
skipping to change at line 22 skipping to change at line 22
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
[[ -z $repo ]] && repo="php" [[ -z $repo ]] && repo="php"
[[ -z $packageQuery ]] && packageQuery="dpkg -l \$x | grep '^ii'" [[ -z $packageQuery ]] && packageQuery="dpkg -l \$x | grep '^ii'"
if [[ $linuxReleaseName == +(*[Bb][Ii][Aa][Nn]*) ]]; then if [[ $linuxReleaseName == +(*[Bb][Ii][Aa][Nn]*) ]]; then
if [[ $OSVersion -gt 9 ]]; then sysvrcconf="sysv-rc-conf"
if [[ $OSVersion -gt 9 ]]; then
[[ -z $php_ver || ${php_ver%.*} -lt 7 ]] && php_ver="7.3" [[ -z $php_ver || ${php_ver%.*} -lt 7 ]] && php_ver="7.3"
[[ -z $php_verAdds ]] && php_verAdds="-$php_ver"
elif [[ $OSVersion -gt 8 ]]; then elif [[ $OSVersion -gt 8 ]]; then
[[ -z $php_ver || ${php_ver%.*} -lt 7 ]] && php_ver="7.0" [[ -z $php_ver || ${php_ver%.*} -lt 7 ]] && php_ver="7.0"
[[ -z $php_verAdds ]] && php_verAdds="-$php_ver"
else else
[[ -z $php_ver ]] && php_ver="5" [[ -z $php_ver ]] && php_ver="5"
[[ -z $php_verAdds ]] && php_verAdds="-5.6"
fi fi
elif [[ $linuxReleaseName == +(*[Uu][Bb][Uu][Nn][Tt][Uu]*|*[Mm][Ii][Nn][Tt]*) ]] ; then elif [[ $linuxReleaseName == +(*[Uu][Bb][Uu][Nn][Tt][Uu]*|*[Mm][Ii][Nn][Tt]*) ]] ; then
DEBIAN_FRONTEND=noninteractive apt-get purge -yq sysv-rc-conf >/dev/null 2>& 1 DEBIAN_FRONTEND=noninteractive apt-get purge -yq sysv-rc-conf >/dev/null 2>& 1
if [[ -z $php_ver || $php_ver != "7.1" || ( $linuxReleaseName == +(*[Uu][Bb] if [[ $linuxReleaseName == +(*[Uu][Bb][Uu][Nn][Tt][Uu]*) ]]; then
[Uu][Nn][Tt][Uu]*) && $OSVersion -ge 18 ) ]]; then case $OSVersion in
if [[ $autoaccept != yes ]]; then 19|20)
echo " *** Detected a potential need to reinstall apache and php fil php_ver="7.3"
es." [[ -z $phpfpm ]] && phpfpm="php${php_ver}-fpm"
echo " *** This will remove the /etc/php* and /etc/apache2* director [[ -z $phpldap ]] && phpldap="php${php_ver}-ldap"
ies" [[ -z $phpcmd ]] && phpcmd="php"
echo " *** and remove/purge the apache and php files from this syst ;;
em." 18)
echo " *** If you're okay with this please type Y, anything else wil php_ver="7.2"
l" [[ -z $phpfpm ]] && phpfpm="php${php_ver}-fpm"
echo " *** continue the installation, but may mean you will need to [[ -z $phpldap ]] && phpldap="php${php_ver}-ldap"
" [[ -z $phpcmd ]] && phpcmd="php"
echo " *** remove the files later and make proper changes as "
echo " *** necessary. (Y/N): "
read dummy
else
dummy="y"
fi
case $dummy in
[Yy])
dots "Removing apache and php files"
rm -rf /etc/php* /etc/apache2*
echo "Done"
dots "Stopping web services"
[[ $systemctl == yes ]] && systemctl stop apache2 >/dev/null 2>&
1 || service apache2 stop >/dev/null 2>&1
[[ ! $? -eq 0 ]] && echo "Failed" || echo "Done"
dots "Removing the apache and php packages"
DEBIAN_FRONTEND=noninteractive apt-get purge -yq 'apache2*' 'php
5*' 'php7*' 'libapache*' >/dev/null 2>&1
[[ ! $? -eq 0 ]] && echo "Failed" || echo "Done"
dots "Resetting our variables to specify php version"
if [[ $linuxReleaseName == +(*[Uu][Bb][Uu][Nn][Tt][Uu]*) && $OSV
ersion -ge 18 ]]; then
php_ver="7.2"
php_verAdds="-7.2"
else
php_ver="7.1"
php_verAdds="-7.1"
fi
phpfpm="php${php_ver}-fpm"
phpldap="php${php_ver}-ldap"
phpcmd="php"
libcurl="libcurl3";
[[ $OSVersion -ge 18 ]] && libcurl="libcurl4"
packages="apache2 build-essential cpp curl g++ gawk gcc genisoim
age gzip htmldoc isc-dhcp-server isolinux lftp libapache2-mod-fastcgi libapache2
-mod-php${php_ver} libc6 $libcurl liblzma-dev m4 mariadb-client mariadb-server n
et-tools nfs-kernel-server openssh-server $phpfpm php-gettext php${php_ver} php$
{php_ver}-cli php${php_ver}-curl php${php_ver}-gd php${php_ver}-json $phpldap ph
p${php_ver}-mysql php${php_ver}-mysqlnd sysv-rc-conf tar tftpd-hpa tftp-hpa vsft
pd wget xinetd zlib1g"
apt-get clean -yq >/dev/null 2>&1
echo "Done"
;; ;;
*)
sysvrcconf="sysv-rc-conf"
php_ver="7.1"
[[ -z $phpfpm ]] && phpfpm="php${php_ver}-fpm"
[[ -z $phpldap ]] && phpldap="php${php_ver}-ldap"
[[ -z $phpcmd ]] && phpcmd="php"
x="*php5* *php-5*"
eval $packageQuery >>$workingdir/error_logs/fog_error_${version}
.log 2>&1
if [[ $? -ne 0 ]]; then
if [[ $autoaccept != yes ]]; then
echo " *** Detected a potential need to reinstall apache
and php files."
echo " *** This will remove the /etc/php* and /etc/apach
e2* directories"
echo " *** and remove/purge the apache and php files fr
om this system."
echo " *** If you're okay with this please type Y, anyth
ing else will"
echo " *** continue the installation, but may mean you
will need to"
echo " *** remove the files later and make proper chang
es as "
echo " *** necessary. (Y/N): "
read dummy
else
dummy="y"
fi
case $dummy in
[Yy])
dots "Removing apache and php files"
rm -rf /etc/php* /etc/apache2*
echo "Done"
dots "Stopping web services"
if [[ $systemctl == yes ]]; then
systemctl is-active --quiet apache2 && systemctl
stop apache2 >/dev/null 2>&1 || true
fi
[[ ! $? -eq 0 ]] && echo "Failed" || echo "Done"
dots "Removing the apache and php packages"
DEBIAN_FRONTEND=noninteractive apt-get purge -yq 'ap
ache2*' 'php5*' 'php7*' 'libapache*' >/dev/null 2>&1
[[ ! $? -eq 0 ]] && echo "Failed" || echo "Done"
apt-get clean -yq >/dev/null 2>&1
;;
esac
fi
esac esac
fi fi
else else
[[ -z $php_ver ]] && php_ver=5 [[ -z $php_ver ]] && php_ver=5
[[ -z $php_verAdds ]] && php_verAdds="-5.6"
fi fi
[[ -z $php_verAdds ]] && php_verAdds="-${php_ver}"
[[ $php_ver == 5 ]] && php_verAdds="-5.6"
[[ $php_ver != 5 ]] && phpcmd="php" || phpcmd="php5" [[ $php_ver != 5 ]] && phpcmd="php" || phpcmd="php5"
[[ -z $phpfpm ]] && phpfpm="php${php_ver}-fpm" [[ -z $phpfpm ]] && phpfpm="php${php_ver}-fpm"
[[ -z $phpldap ]] && phpldap="php${php_ver}-ldap"
[[ -z $phpcmd ]] && phpcmd="php"
case $linuxReleaseName in case $linuxReleaseName in
*[Uu][Bb][Uu][Nn][Tt][Uu]*|*[Bb][Ii][Aa][Nn]*|*[Mm][Ii][Nn][Tt]*) *[Uu][Bb][Uu][Nn][Tt][Uu]*|*[Bb][Ii][Aa][Nn]*|*[Mm][Ii][Nn][Tt]*)
libcurl="libcurl3"; if [[ -z $packages ]]; then
[[ $OSVersion -ge 18 || ( $linuxReleaseName == +(*[Bb][Ii][Aa][Nn]*) && x="mysql-server"
$OSVersion -ge 10 ) ]] && libcurl="libcurl4" eval $packageQuery >>$workingdir/error_logs/fog_error_${version}.log
[[ -z $packages ]] && packages="apache2 build-essential cpp curl g++ gaw 2>&1
k gcc genisoimage gzip htmldoc isc-dhcp-server isolinux lftp libapache2-mod-fast [[ $? -eq 0 ]] && db_packages="mysql-client mysql-server" || db_pack
cgi libapache2-mod-php${php_ver} libc6 $libcurl liblzma-dev m4 mariadb-client ma ages="mariadb-client mariadb-server"
riadb-server net-tools nfs-kernel-server openssh-server $phpfpm php-gettext php$ packages="apache2 build-essential cpp curl g++ gawk gcc genisoimage
{php_ver} php${php_ver}-cli php${php_ver}-curl php${php_ver}-gd php${php_ver}-js git gzip htmldoc isc-dhcp-server isolinux lftp libapache2-mod-fastcgi libapache2
on $phpldap php${php_ver}-mysql php${php_ver}-mysqlnd sysv-rc-conf tar tftpd-hpa -mod-php${php_ver} libc6 libcurl3 liblzma-dev m4 ${db_packages} net-tools nfs-ke
tftp-hpa vsftpd wget xinetd zlib1g" rnel-server openssh-server $phpfpm php-gettext php${php_ver} php${php_ver}-cli p
hp${php_ver}-curl php${php_ver}-gd php${php_ver}-json $phpldap php${php_ver}-mys
ql php${php_ver}-mysqlnd ${sysvrcconf} tar tftpd-hpa tftp-hpa vsftpd wget xinetd
zlib1g"
else
# make sure we update all the php version numbers with those specifi
ed above
packages=${packages//php[0-9]\.[0-9]/php${php_ver}}
fi
[[ -z $packageinstaller ]] && packageinstaller="apt-get -yq install -o D pkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold" [[ -z $packageinstaller ]] && packageinstaller="apt-get -yq install -o D pkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold"
[[ -z $packagelist ]] && packagelist="apt-cache pkgnames | grep" [[ -z $packagelist ]] && packagelist="apt-cache pkgnames | grep"
[[ -z $packageupdater ]] && packageupdater="apt-get -yq upgrade -o Dpkg: :Options::=--force-confdef -o Dpkg::Options::=--force-confold" [[ -z $packageupdater ]] && packageupdater="apt-get -yq upgrade -o Dpkg: :Options::=--force-confdef -o Dpkg::Options::=--force-confold"
[[ -z $packmanUpdate ]] && packmanUpdate="apt-get update" [[ -z $packmanUpdate ]] && packmanUpdate="apt-get update"
[[ -z $dhcpname ]] && dhcpname="isc-dhcp-server" [[ -z $dhcpname ]] && dhcpname="isc-dhcp-server"
[[ -z $olddhcpname ]] && olddhcpname="dhcp3-server" [[ -z $olddhcpname ]] && olddhcpname="dhcp3-server"
;; ;;
esac esac
[[ -z $langPackages ]] && langPackages="language-pack-it language-pack-en langua ge-pack-es language-pack-zh-hans" [[ -z $langPackages ]] && langPackages="language-pack-it language-pack-en langua ge-pack-es language-pack-zh-hans"
[[ $php_ver != 5 ]] && packages="$packages php${php_ver}-mbstring" [[ $php_ver != 5 ]] && packages="$packages php${php_ver}-mbstring"
 End of changes. 10 change blocks. 
70 lines changed or deleted 84 lines changed or added
To the Shell Programs section of the fogproject source changes report or the top of this page
Mainly generated by pkgdiff using rfcdiff
Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)