fatalerrors/init.sh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

finallized merge

Browse Source
This commit is contained in:
levasseur
2021-09-21 17:28:12 +02:00
parent 477f129a6b
commit 0c56bfcd98
3 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
init.sh
View File

@@ -36,11 +36,7 @@ export LC_ALL=C
export LANG=C export LANG=C
# Version of init # Version of init
<<<<<<< HEAD
export VERSION="0.99.7" export VERSION="0.99.7"
=======
export VERSION="0.99.6"
>>>>>>> 8e8a2267286e904fde4e486a171dd141da66fc3a
# Store script's path # Store script's path
export MYPATH=$(dirname $0) export MYPATH=$(dirname $0)
@@ -130,10 +126,7 @@ for mod in $MODULE_LIST; do
done done
if [[ $RUN_SHELL == true ]]; then if [[ $RUN_SHELL == true ]]; then
<<<<<<< HEAD
prnt I "Lancement d'un shell intéractif..." prnt I "Lancement d'un shell intéractif..."
=======
>>>>>>> 8e8a2267286e904fde4e486a171dd141da66fc3a
bash --noprofile --rcfile $MYPATH/bash.rc bash --noprofile --rcfile $MYPATH/bash.rc
prnt I "Sortie du script après exécution du shell." prnt I "Sortie du script après exécution du shell."
exit 0 exit 0

4
modules/conf_disks.sh
View File

@@ -16,11 +16,7 @@
# * CALCDRV: Target drives, preferably through ID. # * CALCDRV: Target drives, preferably through ID.
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
<<<<<<< HEAD
export VER_conf_disks="0.0.9" export VER_conf_disks="0.0.9"
=======
export VER_conf_disks="0.0.8"
>>>>>>> 8e8a2267286e904fde4e486a171dd141da66fc3a
export DEP_conf_disks="upgrade_dist" export DEP_conf_disks="upgrade_dist"
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------

5
modules/install_chromium.sh
View File

@@ -20,12 +20,7 @@ install_chromium()
{ {
# Add Debian Buster repo to sources.list.d directory # Add Debian Buster repo to sources.list.d directory
prnt I "Ajout du dépot Debian Buster aux sources logicielles..." prnt I "Ajout du dépot Debian Buster aux sources logicielles..."
<<<<<<< HEAD
installfile debian_buster.list /etc/apt/sources.list.d/ installfile debian_buster.list /etc/apt/sources.list.d/
=======
installfile debian_buster.lM3t4ll1c4#l9
ist /etc/apt/sources.list.d/
>>>>>>> 8e8a2267286e904fde4e486a171dd141da66fc3a
# Install Debian GPG keys # Install Debian GPG keys
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys DCC9EFBF77E11517 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys DCC9EFBF77E11517