diff --git a/README.md b/README.md index 884ba6df3ce7a63fed7139f4cb9d7f9ffaeb5f31..7f06dd2c8fb1d995e8993b08f7aab1b3a4ba36da 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -PĹ™evod html dokumentace do md formátu (version 0.46) - BETA +PĹ™evod html dokumentace do md formátu (version 0.47) - BETA =========================================================== VĂ˝sledkem projektu by mÄ›l bĂ˝t skript pro staĹľenĂ a pĹ™evod stávajĂcĂ dokumentace na docs.it4i.cz do md formátu @@ -13,17 +13,19 @@ VĂ˝sledkem projektu by mÄ›l bĂ˝t skript pro staĹľenĂ a pĹ™evod stávajĂcĂ dok Pro svou práci si naklonujete Gitem repozitář do svĂ©ho pracovnĂho adresáře. +### VĂ˝voj +| Verze | ÄŤas | zmÄ›ny | +|--------|--------|---| +|0.3|34m56s|pĹ™idánĂ filtru pro html a css| +|0.4|24m56s|oprava obrázkĹŻ + optimalizace| +|0.45|7m56s|optimalizace| +|0.47|11m7s|pĹ™idánĂ filtrĹŻ pro opravu a nahrazenĂ tabulek, vylepšenĂ filtrace, ...| + + >**ProblĂ©my** -> * obrázky nemajĂ správnĂ˝ odkaz na uloĹľenĂ v adresářĂch (částeÄŤnÄ› vyĹ™ešeno) > * internĂ a externĂ odkazy > * formátovánĂ tabulek -> * formátovámĂ textu v nÄ›kterĂ˝ch mĂstech -> * doba pĹ™evodu ~24min - ->**ZmÄ›ny v novĂ© verzi** -> * optimalizace + měřenĂ ÄŤasu -> * rozdÄ›lenĂ filtrĹŻ podle kategorie -> * formátovánĂ tabulek, nahrazenĂ tabulek +> * doba pĹ™evodu ~~24min~~ ### Funkce skriptu @@ -37,10 +39,4 @@ Konverze html do md ```bash html_md.sh -c -``` - -TestovánĂ - -```bash -html_md.sh -t -``` +``` \ No newline at end of file diff --git a/converted/docs.it4i.cz/get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/vnc.md b/converted/docs.it4i.cz/get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/vnc.md index 21118b27bdbe632731a2b3664b7f5dfe3d9821a2..fa671a00ce2053203073a88faafae83ba7db2182 100644 --- a/converted/docs.it4i.cz/get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/vnc.md +++ b/converted/docs.it4i.cz/get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/vnc.md @@ -191,7 +191,7 @@ You should see after the successful login. Open Screensaver preferences dialog: - +Preferences](gdmscreensaver.png/@@images/8e80a92f-f691-4d92-8e62-344128dcc00b.png "Screensaver Preferences")](../../../../salomon/gnome_screen.jpg.1) Uncheck both options below the slider: diff --git a/converted/docs.it4i.cz/salomon/software/compilers.md b/converted/docs.it4i.cz/salomon/software/compilers.md index 2e78a937bca022f39f35f8e2bd428eb354699339..125d99238603c065fc4d9b1f7845ea442c93ebf4 100644 --- a/converted/docs.it4i.cz/salomon/software/compilers.md +++ b/converted/docs.it4i.cz/salomon/software/compilers.md @@ -134,7 +134,7 @@ For more informations see the man pages. To use the Berkley UPC compiler and runtime environment to run the binaries use the module bupc - $ module add bupc + $ module add BerkeleyUPC/2.16.2-gompi-2015b $ upcc -version As default UPC network the "smp" is used. This is very quick and easy diff --git a/html_md.sh b/html_md.sh index aa2a92d562a5cbaa23680d85d1ddbf6c9ce1d07d..4e69e470f57c8a283e68a0d001cc31c2bbf7e9c5 100755 --- a/html_md.sh +++ b/html_md.sh @@ -2,42 +2,11 @@ ### DOWNLOAD AND CONVERT DOCUMENTATION # autor: kru0052 -# version: 0.46 +# version: 0.47 # change: repair tables, optimalization # bugs: bad links for other files, formatting bugs, bad bash and other code (formatting)... ### -if [ "$1" = "-t" ]; then - # testing new function - echo "Testing..." - - printf "\t\tformatting tables...\n" - cat ./test > ./test.md; - - while read x ; do - arg1=`echo "$x" | cut -d"&" -f1 | sed 's:[]\[\^\$\.\*\/\"]:\\\\&:g'`; - arg2=`echo "$x" | cut -d"&" -f2 | sed 's:[]\[\^\$\.\*\/\"]:\\\\&:g'`; - - sed -e 's/'"$arg1"'/'"$arg2"'/' ./test.md > ./test.tmp; - - sed -e :a -e '/\\$/N; s/\\\n//; ta' ./test.tmp > ./test.md; - #cat ./test.tmp > ./test.md; - done < ./source/tab - - - -fi -if [ "$1" = "-t1" ]; then - - STARTTIME=$(date +%s) - - sleep 5 - - ENDTIME=$(date +%s) - echo "It takes $(($ENDTIME - $STARTTIME)) seconds to complete this task..." - - -fi if [ "$1" = "-w" ]; then # download html pages STARTTIME=$(date +%s) @@ -108,7 +77,7 @@ if [ "$1" = "-c" ]; then arg2=`echo "$x" | cut -d"&" -f2 | sed 's:[]\[\^\$\.\*\/\"]:\\\\&:g'`; sed -e 's/'"$arg1"'/'"$arg2"'/' "${i%.*}TMP.md" > "${i%.*}TMP.TEST.md"; - cat "${i%.*}TMP.TEST.md" > "${i%.*}TMP.md"; + cat -s "${i%.*}TMP.TEST.md" > "${i%.*}TMP.md"; done < ./source/replace # repair formatting... @@ -118,7 +87,7 @@ if [ "$1" = "-c" ]; then arg2=`echo "$x" | cut -d"&" -f2 | sed 's:[]\[\^\$\.\*\/\"]:\\\\&:g'`; sed -e 's/'"$arg1"'/'"$arg2"'/' "${i%.*}TMP.md" > "${i%.*}TMP.TEST.md"; - cat "${i%.*}TMP.TEST.md" > "${i%.*}TMP.md"; + cat -s "${i%.*}TMP.TEST.md" > "${i%.*}TMP.md"; done < ./source/formatting