adapted certain things to match this repository style again.

homematic-community · Nov 3, 2020 · 8625e5f · 8625e5f
1 parent b7b8670
commit 8625e5f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+.DS_Store
+*.tar.gz
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.1
+2.2
diff --git a/generate_img.sh b/generate_img.sh
@@ -1,7 +1,4 @@
 #!/bin/sh
-COPYFILE_DISABLE=1; export COPYFILE_DISABLE
-rm -f *.tar.gz
-
 mkdir -p tmp/addon/
 cp -a update_script tmp/
 cp -a rc.d tmp/
@@ -10,11 +7,9 @@ cp -a VERSION tmp/addon/
 cd tmp
 chmod +x update_script
 
-find . -name ".DS_Store" -exec rm -rf {} \;
-find . -name "._*" -exec rm -rf {} \;
-dot_clean .
+[ -f /usr/sbin/dot_clean ] && dot_clean .
 
-tar  -zcf ../hm-print-$(cat ../VERSION).tar.gz * 
+COPYFILE_DISABLE=1 tar --owner=root --group=root --exclude=.DS_Store -czvf ../hm-print-$(cat ../VERSION).tar.gz *
 
 cd ..
 rm -rf tmp
diff --git a/rc.d/programmedrucken b/rc.d/programmedrucken
@@ -23,15 +23,15 @@ RCGISTRING="setFooter(s); var scriptpp = document.createElement(\\\\\"script\\\\
 SSTRINGZWO="setFooter(s);"
 RSTRINGZWO="setFooter(s); var scriptpp = document.createElement(\"script\"); scriptpp.type = \"text/javascript\"; scriptpp.src = \"/addons/print/functions.js\"; \$(\"body\").appendChild(scriptpp);"
 
-# String to include the print button for single "Direkte Verknüpfung"
+# String to include the print button for single "Direkte Verknüpfung"
 SCGISTRINGZWO="<td style='text-align:center; vertical-align:middle;'><div class='FooterButton' onclick='CollectData_SaveProfileSettings(0);'>\\\\\${footerBtnOk}</div></td>\\\\\";"
 RCGISTRINGZWO="<td style='text-align:center; vertical-align:middle;'><div class='FooterButton' onclick='CollectData_SaveProfileSettings(0);'>\\\\\${footerBtnOk}</div></td><td style='text-align:center; vertical-align:middle;'><div class='FooterButton' onclick='PrintPage();'>Drucken</div></td>\\\\\";"
 
-# String to include the overview print button in "Direkte Verknüpfungen"
+# String to include the overview print button in "Direkte Verknüpfungen"
 SOVERDVCGI="<td  style='text-align:center; vertical-align:middle;'><div class='FooterButton CLASS22100' onclick='loadNewLinkPage();' >\\\\\"+ translateKey('footerBtnNewLink') +\\\\\"</div></td>\\\\\";"
 ROVERDVCGI="<td  style='text-align:center; vertical-align:middle;'><div class='FooterButton CLASS22100' onclick='loadNewLinkPage();' >\\\\\"+ translateKey('footerBtnNewLink') +\\\\\"</div></td></td><td style='text-align:center; vertical-align:middle;'><div class='FooterButton CLASS04906' onclick='PrintAllDV();'>\&Uuml;bersicht Drucken</div></td>\\\\\";"
 
-# String to include the print button in "Geräteparameter"
+# String to include the print button in "Geräteparameter"
 SDEVPARACGI="<td style='text-align:center; vertical-align:middle;'><div class='FooterButton' onclick='CloseDeviceParameters();'>\\\\\"+translateKey('footerBtnCancel')+\\\\\"</div></td>\\\\\";"
 RDEVPARACGI="<td style='text-align:center; vertical-align:middle;'><div class='FooterButton' onclick='CloseDeviceParameters();'>\\\\\"+translateKey('footerBtnCancel')+\\\\\"</div></td><td style='text-align:center; vertical-align:middle;'><div class='FooterButton' onclick='PrintDevPara();'>Drucken</div></td>\\\\\";"
 
@@ -55,15 +55,15 @@ RCGISTRING="setFooter(s); var scriptpp = document.createElement(\\\\\"script\\\\
 SSTRINGZWO="setFooter(s);"
 RSTRINGZWO="setFooter(s); var scriptpp = document.createElement(\"script\"); scriptpp.type = \"text/javascript\"; scriptpp.src = \"/addons/print/functions.js\"; \$(\"body\").appendChild(scriptpp);"
 
-# String to include the print button for single "Direkte Verknüpfung"
+# String to include the print button for single "Direkte Verknüpfung"
 SCGISTRINGZWO="<td align='center' valign='middle'><div class='FooterButton' onclick='CollectData_SaveProfileSettings(0);'>\\\\\${footerBtnOk}</div></td>\\\\\";"
 RCGISTRINGZWO="<td align='center' valign='middle'><div class='FooterButton' onclick='CollectData_SaveProfileSettings(0);'>\\\\\${footerBtnOk}</div></td><td align='center' valign='middle'><div class='FooterButton' onclick='PrintPage();'>Drucken</div></td>\\\\\";"
 
-# String to include the overview print button in "Direkte Verknüpfungen"
+# String to include the overview print button in "Direkte Verknüpfungen"
 SOVERDVCGI="<td align='center' valign='middle'><div class='FooterButton CLASS22100' onclick='loadNewLinkPage();' >\\\\\"+ translateKey('footerBtnNewLink') +\\\\\"</div></td>\\\\\";"
 ROVERDVCGI="<td align='center' valign='middle'><div class='FooterButton CLASS22100' onclick='loadNewLinkPage();' >\\\\\"+ translateKey('footerBtnNewLink') +\\\\\"</div></td></td><td align='center' valign='middle'><div class='FooterButton CLASS04906' onclick='PrintAllDV();'>\&Uuml;bersicht Drucken</div></td>\\\\\";"
 
-# String to include the print button in "Geräteparameter"
+# String to include the print button in "Geräteparameter"
 SDEVPARACGI="<td align='center' valign='middle'><div class='FooterButton' onclick='CloseDeviceParameters();'>\\\\\"+translateKey('footerBtnCancel')+\\\\\"</div></td>\\\\\";"
 RDEVPARACGI="<td align='center' valign='middle'><div class='FooterButton' onclick='CloseDeviceParameters();'>\\\\\"+translateKey('footerBtnCancel')+\\\\\"</div></td><td align='center' valign='middle'><div class='FooterButton' onclick='PrintDevPara();'>Drucken</div></td>\\\\\";"
 
@@ -199,11 +199,10 @@ case "$1" in
 
 		;;
 	info)
-    echo "Info: <b>Programmedrucken</b><br>"
-	echo "Info: <b>CCU2 & RaspberryMatic</b><br>"
-	echo "Info: (c) 2010-2017 HMside, anli<br><br>"
-	echo "Info: (c) 2020 modified by jp112sdl for 3.53.xx<br>"
-	echo "Info: <a href='https://github.com/jp112sdl/hm-print'>Fork on Github</a>"
+    echo "Info: <b>Programmedrucken CCU Addon</b><br/>"
+    echo "Info: Erzeugt Druckansichten für Programme<br/><br/>"
+    echo "Info: (c) 2010-2020 HMside, anli, jp112sdl, jens-maus<br/>"
+    echo "Info: <a href='https://github.com/litti/hm-print'>https://github.com/litti/hm-print</a>"
     echo "Version: $(cat ${ADDON_DIR}/VERSION)"
     echo "Name: Programmedrucken"
     echo "Operations: uninstall"

diff --git a/www/update-check.cgi b/www/update-check.cgi
@@ -1,7 +1,7 @@
 #!/bin/tclsh
 
-set checkURL    "https://raw.githubusercontent.com/jp112sdl/hm-print/master/VERSION"
-set downloadURL "https://github.com/jp112sdl/hm-print/releases"
+set checkURL    "https://raw.githubusercontent.com/litti/hm-print/master/VERSION"
+set downloadURL "https://github.com/litti/hm-print/releases"
 
 catch {
   set input $env(QUERY_STRING)
@@ -26,4 +26,4 @@ if { [info exists cmd ] && $cmd == "download"} {
   } else {
     puts "n/a"
   }
-}
+}