marko/cwsvJudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into homepage

Browse Source
This commit is contained in:
marko
2022-02-19 10:41:26 +01:00
parent 95e7a877cb acf6c09b0d
commit a87ceaa2b7
94 changed files with 4165 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
homepage/cwsvJudo/Makefile
View File

@@ -94,7 +94,11 @@ build/.uploadMarker/amp/%.php: build/amp/%.php
mkdir -p build/.uploadMarker/amp
curl \
--upload-file $^ \
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:***REMOVED*** \
>>>>>>> master
ftp://cwsvjudo.bplaced.net/www/pages/$(patsubst build/amp/%.php,amp/%.php,$^) \
--ftp-create-dirs
touch $@
@@ -105,7 +109,11 @@ build/.uploadMarker/phpLib/%.php: phpLib/%.php
mkdir -p build/.uploadMarker/phpLib/phpcount
curl \
--upload-file $^ \
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:***REMOVED*** \
>>>>>>> master
ftp://cwsvjudo.bplaced.net/www/ressourcen/$(patsubst build/%.php,%.php,$^) \
--ftp-create-dirs
touch $@
@@ -114,7 +122,11 @@ build/.uploadMarker/css/%.css: build/css/%.css
mkdir -p build/.uploadMarker/css
curl \
--upload-file $^ \
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:***REMOVED*** \
>>>>>>> master
ftp://cwsvjudo.bplaced.net/www/ressourcen/$(patsubst build/%,%,$^) \
--ftp-create-dirs
touch $@
@@ -124,7 +136,11 @@ build/.uploadMarker/config/%: config/%
mkdir -p build/.uploadMarker/config
curl \
--upload-file $^ \
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:***REMOVED*** \
>>>>>>> master
ftp://cwsvjudo.bplaced.net/www/$(patsubst build/%,%,$^) \
--ftp-create-dirs
touch $@

4
homepage/cwsvJudo/src/Makefiles/Makefile.ftpUpload
View File

@@ -22,7 +22,11 @@ ftpPathBase = /www
ftpServer = cwsvjudo.bplaced.net
ftpUser = cwsvjudo
<<<<<<< HEAD
ftpPassword = ***REMOVED***
=======
ftpPassword = ***REMOVED***
>>>>>>> master
ftpPathBase = /www
ftpFilePath = videoalben/videoalben.2018

24
homepage/cwsvJudo/src/Makefiles/Makefile.vidstab
View File

@@ -112,7 +112,11 @@ videos/webm/%.webm: videos/aufnahmen/mögel/%.MP4
$@
curl \
--upload-file $@ \
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:***REMOVED*** \
>>>>>>> master
ftp://cwsvjudo.bplaced.net/www/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@) \
--ftp-create-dirs
@@ -142,7 +146,11 @@ videos/webm/%.webm: videos/aufnahmen/moegel/%.MP4
$@
curl \
--upload-file $@ \
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:***REMOVED*** \
>>>>>>> master
ftp://cwsvjudo.bplaced.net/www/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@) \
--ftp-create-dirs
@@ -173,7 +181,11 @@ videos/webm/%.webm: videos/aufnahmen/papaRomy/%.mp4
$@
curl \
--upload-file $@ \
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:***REMOVED*** \
>>>>>>> master
"ftp://cwsvjudo.bplaced.net/www/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@)" \
--ftp-create-dirs
@@ -203,7 +215,11 @@ videos/webm/%.webm: videos/aufnahmen/papaRomy/%.webm
$@
curl \
--upload-file $@ \
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:***REMOVED*** \
>>>>>>> master
"ftp://cwsvjudo.bplaced.net/www/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@)" \
--ftp-create-dirs
@@ -233,7 +249,11 @@ videos/webm/%.webm: videos/aufnahmen/elly/%.mp4
"$@"
# curl \
# --upload-file "$@" \
<<<<<<< HEAD
# --user cwsvjudo:***REMOVED*** \
=======
# --user cwsvjudo:***REMOVED*** \
>>>>>>> master
# "ftp://cwsvjudo.bplaced.net/www/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@)" \
# --ftp-create-dirs
@@ -242,7 +262,11 @@ videos/thumbnails/%.jpg: videos/webm/%.webm
-ffmpeg -i "$^" -vf "select=gt(scene\,0.4)" -frames:v 5 -vsync vfr -vf fps=fps=1/600 "$@"
# curl \
# --upload-file "$@" \
<<<<<<< HEAD
# --user cwsvjudo:***REMOVED*** \
=======
# --user cwsvjudo:***REMOVED*** \
>>>>>>> master
# "ftp://cwsvjudo.bplaced.net/www/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@)" \
# --ftp-create-dirs

4
homepage/cwsvJudo/src/Makefiles/Makefile.vidstabAv1Cq
View File

@@ -121,7 +121,11 @@ videos/mkv/%.mkv: videos/aufnahmen/helko/%.mp4
# --ftp-create-dirs
# curl \
# --upload-file "$@" \
<<<<<<< HEAD
# --user cwsvjudo:***REMOVED*** \
=======
# --user cwsvjudo:***REMOVED*** \
>>>>>>> master
# "ftp://cwsvjudo.bplaced.net/www/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@)" \
# --ftp-create-dirs

24
homepage/cwsvJudo/src/Makefiles/Makefile.vp9
View File

@@ -129,7 +129,11 @@ videos/webm/%.webm: videos/aufnahmen/moegel/%.MP4
# --ftp-create-dirs
curl \
--upload-file $@ \
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:***REMOVED*** \
>>>>>>> master
ftp://cwsvjudo.bplaced.net/www/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@) \
--ftp-create-dirs
@@ -174,7 +178,11 @@ videos/webm/%.webm: videos/aufnahmen/helko/%.mp4
# --ftp-create-dirs
curl \
--upload-file $@ \
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:***REMOVED*** \
>>>>>>> master
ftp://cwsvjudo.bplaced.net/www/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@) \
--ftp-create-dirs
@@ -209,7 +217,11 @@ videos/webm/%.webm: videos/aufnahmen/papaRomy/%.mp4
# --ftp-create-dirs
curl \
--upload-file $@ \
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:***REMOVED*** \
>>>>>>> master
"ftp://cwsvjudo.bplaced.net/www/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@)" \
--ftp-create-dirs
@@ -244,7 +256,11 @@ videos/webm/%.webm: videos/aufnahmen/papaRomy/%.webm
# --ftp-create-dirs
curl \
--upload-file $@ \
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:***REMOVED*** \
>>>>>>> master
"ftp://cwsvjudo.bplaced.net/www/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@)" \
--ftp-create-dirs
@@ -279,7 +295,11 @@ videos/webm/%.webm: videos/aufnahmen/elly/%.mp4
# --ftp-create-dirs
curl \
--upload-file "$@" \
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:***REMOVED*** \
>>>>>>> master
"ftp://cwsvjudo.bplaced.net/www/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@)" \
--ftp-create-dirs
@@ -293,7 +313,11 @@ videos/thumbnails/%.jpg: videos/webm/%.webm
# --ftp-create-dirs
curl \
--upload-file "$@" \
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:***REMOVED*** \
>>>>>>> master
"ftp://cwsvjudo.bplaced.net/www/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@)" \
--ftp-create-dirs

4
homepage/cwsvJudo/src/tools/mkGalGen/jsonAlbumTest-Template.sh
View File

@@ -27,4 +27,8 @@ python3 ${mkGalGenPath}/jsonJpgList2Makefile.py ${imgDirBase}/jpegAlbum.json --i
#das aufrufen des makefiles
make --file=Makefile.${galDirName}
# upload des ganzen
<<<<<<< HEAD
lftp -e "mirror -R ${galDirBase}/${galDirName} photoalben/photoalben.2018/${galDirName}" -u cwsvjudo,***REMOVED*** ftp://cwsvjudo.bplaced.net
=======
lftp -e "mirror -R ${galDirBase}/${galDirName} photoalben/photoalben.2018/${galDirName}" -u cwsvjudo,***REMOVED*** ftp://cwsvjudo.bplaced.net
>>>>>>> master