townsfolk/obosdi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'src'

Browse source
This commit is contained in:
MatMoul 2015-12-07 01:41:51 +01:00
commit bb7549720c
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -6,11 +6,7 @@ First, install Arch Linux with the official media and optionally with archfi.<br
Look at archfi project to start your arch linux installation : https://github.com/MatMoul/archfi Look at archfi project to start your arch linux installation : https://github.com/MatMoul/archfi
After reboot and your network ready, download the script :<br /> After reboot and your network ready, download the script :<br />
<<<<<<< HEAD
curl -L archdi.sf.net/archdi > archdi<br /> curl -L archdi.sf.net/archdi > archdi<br />
=======
curl -L archdi.sourceforge.net/archdi > archdi<br />
>>>>>>> 0d7f612ed8fdbba9ecd54359a7c77bfd79f7c2cf
or if sourceforge is down :<br /> or if sourceforge is down :<br />
curl -L matmoul.github.io/archdi > archdi<br /> curl -L matmoul.github.io/archdi > archdi<br />

6
archdi
View file

@ -12,8 +12,8 @@
apptitle="Arch Linux Desktop Install (archdi) - Version: 2015.12.07.01.26.48 (GPLv3)" apptitle="Arch Linux Desktop Install (archdi) - Version: 2015.12.07.01.41.41 (GPLv3)"
version="2015.12.07.01.26.48" version="2015.12.07.01.41.41"
cachedir=~/.cache/archdi cachedir=~/.cache/archdi
lastverurl1=http://archdi.sourceforge.net/version lastverurl1=http://archdi.sourceforge.net/version
@ -139,7 +139,7 @@ while (( "$#" )); do
liburl1=https://raw.githubusercontent.com/MatMoul/archdi-pkg/$1/lib liburl1=https://raw.githubusercontent.com/MatMoul/archdi-pkg/$1/lib
liburl2=https://raw.githubusercontent.com/MatMoul/archdi-pkg/$1/lib liburl2=https://raw.githubusercontent.com/MatMoul/archdi-pkg/$1/lib
branchoption="$1" branchoption="$1"
apptitle="Arch Linux Desktop Install (archdi) - Version: 2015.12.07.01.26.48 (GPLv3)" apptitle="Arch Linux Desktop Install (archdi) - Version: 2015.12.07.01.41.41 (GPLv3)"
;; ;;
esac esac
shift shift

2
version
View file

@ -1 +1 @@
2015.12.07.01.26.48 2015.12.07.01.41.41