Clean Head
This commit is contained in:
parent
26f8b04501
commit
d93cd9127b
1 changed files with 2 additions and 9 deletions
11
archfi
11
archfi
|
@ -12,11 +12,7 @@
|
||||||
# referance : https://wiki.archlinux.org/index.php/Installation_guide
|
# referance : https://wiki.archlinux.org/index.php/Installation_guide
|
||||||
|
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
apptitle="Arch Linux Fast Install (archfi) - Version: 2016.04.12.23.45.07 (GPLv3)"
|
apptitle="Arch Linux Fast Install (archfi) - Version: 2016.04.12.23.45.07 (GPLv3)"
|
||||||
=======
|
|
||||||
apptitle="Arch Linux Fast Install (archfi) - Version: 2016.04.12.23.56.56 (GPLv3)"
|
|
||||||
>>>>>>> src
|
|
||||||
baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master
|
baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master
|
||||||
|
|
||||||
|
|
||||||
|
@ -1342,11 +1338,8 @@ loadstrings(){
|
||||||
# --------------------------------------------------------
|
# --------------------------------------------------------
|
||||||
while (( "$#" )); do
|
while (( "$#" )); do
|
||||||
case $1 in
|
case $1 in
|
||||||
baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master
|
-t | --test) baseurl="https://raw.githubusercontent.com"
|
||||||
<<<<<<< HEAD
|
baseurl="$baseurl/$2/archfi/$3";;
|
||||||
=======
|
|
||||||
baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master
|
|
||||||
>>>>>>> src
|
|
||||||
--chroot) chroot=1
|
--chroot) chroot=1
|
||||||
command=$2
|
command=$2
|
||||||
args=$3;;
|
args=$3;;
|
||||||
|
|
Loading…
Reference in a new issue